[Zodb-checkins] SVN: ZODB/branches/3.6/src/ZODB/ Merge revs 40617 and 40739 from ZODB trunk.

[Tim Peters]

Log message for revision 40740:
  Merge revs 40617 and 40739 from ZODB trunk.
  
  Repair typo in exception message.
  

Changed:
  U   ZODB/branches/3.6/src/ZODB/serialize.py
  U   ZODB/branches/3.6/src/ZODB/tests/testcrossdatabasereferences.py

-=-
Modified: ZODB/branches/3.6/src/ZODB/serialize.py
===================================================================
--- ZODB/branches/3.6/src/ZODB/serialize.py	2005-12-12 17:25:26 UTC (rev 40739)
+++ ZODB/branches/3.6/src/ZODB/serialize.py	2005-12-12 17:48:40 UTC (rev 40740)
@@ -340,7 +340,7 @@
             if self._jar.get_connection(database_name) is not obj._p_jar:
                 raise InvalidObjectReference(
                     "Attempt to store a reference to an object from "
-                    "a separate onnection to the same database or "
+                    "a separate connection to the same database or "
                     "multidatabase"
                     )
 

Modified: ZODB/branches/3.6/src/ZODB/tests/testcrossdatabasereferences.py
===================================================================
--- ZODB/branches/3.6/src/ZODB/tests/testcrossdatabasereferences.py	2005-12-12 17:25:26 UTC (rev 40739)
+++ ZODB/branches/3.6/src/ZODB/tests/testcrossdatabasereferences.py	2005-12-12 17:48:40 UTC (rev 40740)
@@ -56,7 +56,7 @@
     Traceback (most recent call last):
     ...
     InvalidObjectReference: Attempt to store a reference to an object
-    from a separate onnection to the same database or multidatabase
+    from a separate connection to the same database or multidatabase
 
     >>> tm.abort()
 
@@ -72,7 +72,7 @@
     Traceback (most recent call last):
     ...
     InvalidObjectReference: Attempt to store a reference to an object
-    from a separate onnection to the same database or multidatabase
+    from a separate connection to the same database or multidatabase
 
     >>> tm.abort()