1. 04 Oct, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27742 from 3.3 branch. · ac2f4078
      Tim Peters authored
      Use proto 1 pickles in ZEO/zrpc/Marshaller.encode().
      
      This rehabilitates the good part of Andreas's change; adds
      news; adds comments; and adds more comments about the
      sequence of undocumented cPickle gimmicks this relies on.
      ac2f4078
  2. 30 Sep, 2004 2 commits
    • Tim Peters's avatar
      Merge rev 27723 from 3.3 branch. · c734eb61
      Tim Peters authored
      Merge rev 27722 from Zope trunk.
      
      Collector #1517: History tab for ZPT does not work
      
      FileStorage.history() was reading the user, description,
      and extension fields out of the object pickle, due to
      starting the read at a wrong location.
      c734eb61
    • Tim Peters's avatar
      Merge rev 27717 from 3.3 branch. · 54ee7efb
      Tim Peters authored
      Merge rev 27712 from Zope trunk.
      
      Restore the Connection._opened attribute, actually used by
      DB.connectionDebugInfo().
      54ee7efb
  3. 29 Sep, 2004 2 commits
  4. 27 Sep, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27695 from 3.3 branch. · 2a6c3ac5
      Tim Peters authored
      Transaction.begin().
      
      When raising DeprecationWarning, point the warning machinery at
      the caller, not at Transaction.begin() itself.  As is (voice
      of experience <wink>), these warnings are darned near useless to
      track down code that needs to be changed on Zope trunk.  With the
      change, the warnings point directly at the deprecated uses.
      2a6c3ac5
  5. 23 Sep, 2004 1 commit
  6. 17 Sep, 2004 4 commits
    • Tim Peters's avatar
      Merge rev 27621 from 3.3 branch. · 0e1022ec
      Tim Peters authored
      Check in stuff mistakenly committed from the Zope trunk.
      
      Rev 26842 changed cache-size parameters to type byte-size.
      That's a good change, but it was checked in from a wrong place
      (from the Zope trunk's copy of ZODB).  Since we want Zope 2.8 to
      be usable with ZODB 3.3 too, I need to slam this change into
      3.3 now.
      
      Alas, I don't understand how ZODB+ZEO got stitched into the
      Zope trunk (I do understand how it got stitched into the
      Zope3 trunk, and into the X3 branch), and it looks like that
      was left in a poor state.
      0e1022ec
    • Tim Peters's avatar
      c9fa23e5
    • Tim Peters's avatar
      69197ab6
    • Tim Peters's avatar
      Merge rev 27557 from 3.3 branch. · 9087e56d
      Tim Peters authored
      New test checkReadConflictErrorClearedDuringAbort().
      
      This confirms that 3.3 didn't have the 3.2.4c1 bug wherein
      an explict transaction abort() failed to clear Connections'
      memory of ReadConflictErrors.
      9087e56d
  7. 14 Sep, 2004 4 commits
    • Tim Peters's avatar
      Merge rev 27526 from 3.3 branch. · c9c2393e
      Tim Peters authored
      Act as if a 3.3c1 release were being made.  Maybe it will
      be.  Besides "the usual" release fiddling, repaired many
      out-of-date pieces of the ZODB programming guide; I'm sure
      many remain, though.
      c9c2393e
    • Tim Peters's avatar
      Merge rev 27524 from 3.3 branch. · 907bd96e
      Tim Peters authored
      A test here didn't clean up after a failing commit().
      907bd96e
    • Tim Peters's avatar
      Merge rev 27522 from 3.3 branch. · 59f9c4e2
      Tim Peters authored
      Removed obsolete comment.
      59f9c4e2
    • Tim Peters's avatar
      Merge rev 27520 from 3.3 branch. · f2976c06
      Tim Peters authored
      As discussed on zodb-dev, failing commit "sticks" now.
      
      After a commit fails (raises an exception), all subsequent attempts
      to commit, join, or register with the transaction now raise the new
      TransactionFailedError.  The failed transaction must be explicitly
      discarded now, via abort() on the transaction or begin() on its
      transaction manager.
      f2976c06
  8. 10 Sep, 2004 1 commit
  9. 09 Sep, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27481 from 3.3 branch. · fc9fe5ca
      Tim Peters authored
      Forward port from Zope 2.7 branch.
      
      The ConflictError.get_{old,new}_serial() methods each did what the other
      was supposed to do.
      fc9fe5ca
  10. 04 Sep, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27446 from 3.3 branch. · ab0433ec
      Tim Peters authored
      Port from Zope 2.7 branch.
      
      Collector #1488 (TemporaryStorage -- going backward in time).
      
      This confusion was really due to that the detail on a ConflictError
      exception didn't make sense.
      ab0433ec
  11. 31 Aug, 2004 3 commits
  12. 27 Aug, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27301 from 3.3 branch. · 4344d865
      Tim Peters authored
      Raise ConnectionStateError if an attempt to close a connection
      is made while the connection has a pending subtransaction.
      4344d865
  13. 26 Aug, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27279 from 3.3 branch. · eb3efdfb
      Tim Peters authored
      Transaction.begin() didn't do anything.
      
      begin() is supposed to abort the current transaction, but
      Transaction.begin() did not.  Calling begin() on a transaction
      *manager* worked fine, and is the intended way to do a begin()
      in 3.3.  But calling begin() on a Transaction object is still
      very easy to do (e.g., the older get_transaction().begin()
      spelling still works), and shouldn't be a subtle disaster.
      eb3efdfb
  14. 25 Aug, 2004 2 commits
  15. 23 Aug, 2004 3 commits
  16. 21 Aug, 2004 3 commits
  17. 19 Aug, 2004 1 commit
  18. 18 Aug, 2004 1 commit
    • Tim Peters's avatar
      Merge rev 27179 from 3.3 branch. · a30763f2
      Tim Peters authored
      Forward port from Zope 2.7 branch.
      
      analyze_rec():  This produced spurious "len of unsized object" messages
      when a data record had a backpointer instead of a pickle.  Repaired.
      
      analyze(), analyze_trans():  Simplified overly elaborate iteration code.
      a30763f2
  19. 17 Aug, 2004 2 commits
  20. 13 Aug, 2004 1 commit
  21. 12 Aug, 2004 2 commits
    • Tim Peters's avatar
      Merge/port assorted ZODB changes checked into Zope3's ZODB copy. · bf9f6bb5
      Tim Peters authored
      Please don't do that:  ZODB changes need to be done in the ZODB
      project.  Checkins to Zope3 have no effect on ZODB in reality.
      
      This includes:
      
      r26945 | jim | 2004-08-06 18:30:44 -0400 (Fri, 06 Aug 2004) | 6 lines
         M /Zope3/trunk/src/persistent/tests/test_persistent.py
      
      Updated to work with the versions of doctest from Python with versions
        greater than or equal to 2.3.0 and less than 2.4.0.a2 and with
        versions greater than 2.4.0a2.
      
      r26482 | srichter | 2004-07-13 13:07:03 -0400 (Tue, 13 Jul 2004) | 2 lines
         M /Zope3/trunk/src/transaction/__init__.py
         M /Zope3/trunk/src/transaction/_transaction.py
         M /Zope3/trunk/src/transaction/tests/test_transaction.py
      
      Converted XXX to TODO.
      
      r25953 | sidnei | 2004-06-23 13:14:20 -0400 (Wed, 23 Jun 2004) | 1 line
         M /Zope3/trunk/src/ZODB/interfaces.py
         M /Zope3/trunk/src/transaction/_transaction.py
      
      Add missing sortKey method to ZopeDBTransactionManager and DataManagerAdapter,
      and also add it to the interface.
      
      r25273 | philikon | 2004-06-06 04:43:57 -0400 (Sun, 06 Jun 2004) | 4 lines
      Changed paths:
         M /Zope3/trunk/src/BTrees
         M /Zope3/trunk/src/ZODB
         M /Zope3/trunk/src/persistent
      
      Ignore .so files.
      
      This fix should probably be merged to the original ZODB tree.
      bf9f6bb5
    • Tim Peters's avatar
      caa12063
  22. 11 Aug, 2004 2 commits