Duplicate import removed.

Merge revs 27788 and 27795 from Zope trunk.

See Collector #1350.

ghostify() and unghostify() detect one form of thread insanity
now.  In a debug build, they abort the process if it happens.
In a release build, unghostify() raises SystemError, and
ghostify() ignores it (ghostify() can't raise an exception).

See Collector #1350.

ghostify() and unghostify() detect one form of thread insanity
now.  In a debug build, they abort the process if it happens.
In a release build, unghostify() raises SystemError, and
ghostify() ignores it (ghostify() can't raise an exception).

before I went on vacation a couple weeks ago.

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.

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.

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.

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.

Merge rev 27712 from Zope trunk.

Restore the Connection._opened attribute, actually used by
DB.connectionDebugInfo().

Restore the Connection._opened attribute, actually used by
DB.connectionDebugInfo().

Typo repair.

os.listdir() now prints errors on stdout

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.

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.

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.

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.

So that if Zope X3-3.0 final is released while I'm on vacation,
it will have the right ZODB stuff in it (although I still need
to stitch this in to the Zope 3 and X3 trees).

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.

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.

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.

be.  Besides "the usual" release fiddling, repaired many
out-of-date pieces of the ZODB programming guide; I'm sure
many remain, though.

A test here didn't clean up after a failing commit().

transaction when a commit() fails.  One test here provoked a
failing commit(), which caused a later test to fail.  Repaired
by simply abort()'ing the failed transaction.

Removed obsolete comment.

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.

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.