[Checkins] SVN: zope.session/trunk/ ZODB 3.9 no longer contains ZODB.utils.ConflictResolvingMappingStorage, fixed tests, so they work both with ZODB 3.8 and 3.9.

[Michael Howitz]

Log message for revision 94410:
  ZODB 3.9 no longer contains ZODB.utils.ConflictResolvingMappingStorage, fixed tests, so they work both with ZODB 3.8 and 3.9.
  
  

Changed:
  U   zope.session/trunk/CHANGES.txt
  U   zope.session/trunk/src/zope/session/tests.py

-=-
Modified: zope.session/trunk/CHANGES.txt
===================================================================
--- zope.session/trunk/CHANGES.txt	2008-12-28 10:31:45 UTC (rev 94409)
+++ zope.session/trunk/CHANGES.txt	2008-12-29 10:42:57 UTC (rev 94410)
@@ -7,6 +7,11 @@
 
 - Specify i18n_domain for titles in apidoc.zcml
 
+- ZODB 3.9 no longer contains
+  ZODB.utils.ConflictResolvingMappingStorage, fixed tests, so they
+  work both with ZODB 3.8 and 3.9.
+
+
 version 3.7.0 (2008-10-03)
 --------------------------
 

Modified: zope.session/trunk/src/zope/session/tests.py
===================================================================
--- zope.session/trunk/src/zope/session/tests.py	2008-12-28 10:31:45 UTC (rev 94409)
+++ zope.session/trunk/src/zope/session/tests.py	2008-12-29 10:42:57 UTC (rev 94410)
@@ -103,11 +103,17 @@
     by getting a connection and putting a session data container in the root,
     within transaction manager "A".
 
-    >>> from ZODB.DB import DB
-    >>> from ZODB.tests.util import ConflictResolvingMappingStorage
+    >>> try:
+    ...     # ZODB 3.8
+    ...     from ZODB.DB import DB
+    ...     from ZODB.tests.util import ConflictResolvingMappingStorage
+    ...     db = DB(ConflictResolvingMappingStorage())
+    ... except ImportError:
+    ...     # ZODB 3.9 (ConflictResolvingMappingStorage no longer exists)
+    ...     import ZODB.DB
+    ...     db = ZODB.DB('Data.fs')
     >>> from zope.session.session import (
     ...     PersistentSessionDataContainer, SessionData)
-    >>> db = DB(ConflictResolvingMappingStorage())
     >>> import transaction
     >>> tm_A = transaction.TransactionManager()
     >>> conn_A = db.open(transaction_manager=tm_A)