[Zodb-checkins] SVN: ZODB/branches/tseaver-python_picklecache-2/src/ Back out IConnectionPrivate.

[Tres Seaver]

Log message for revision 120389:
  Back out IConnectionPrivate.
  
  Add the '_cache' attribute to IPersistentDataManager instead.

Changed:
  U   ZODB/branches/tseaver-python_picklecache-2/src/ZODB/Connection.py
  U   ZODB/branches/tseaver-python_picklecache-2/src/ZODB/interfaces.py
  U   ZODB/branches/tseaver-python_picklecache-2/src/ZODB/tests/testConnection.py
  U   ZODB/branches/tseaver-python_picklecache-2/src/persistent/interfaces.py

-=-
Modified: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/Connection.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/ZODB/Connection.py	2011-02-16 15:54:28 UTC (rev 120388)
+++ ZODB/branches/tseaver-python_picklecache-2/src/ZODB/Connection.py	2011-02-16 16:26:30 UTC (rev 120389)
@@ -29,7 +29,6 @@
 # interfaces
 from persistent.interfaces import IPersistentDataManager
 from ZODB.interfaces import IConnection
-from ZODB.interfaces import IConnectionPrivate
 from ZODB.interfaces import IBlobStorage
 from ZODB.interfaces import IMVCCStorage
 from ZODB.blob import Blob, rename_or_copy_blob, remove_committed_dir
@@ -72,7 +71,6 @@
     """Connection to ZODB for loading and storing objects."""
 
     implements(IConnection,
-               IConnectionPrivate,
                ISavepointDataManager,
                IPersistentDataManager,
                ISynchronizer)

Modified: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/interfaces.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/ZODB/interfaces.py	2011-02-16 15:54:28 UTC (rev 120388)
+++ ZODB/branches/tseaver-python_picklecache-2/src/ZODB/interfaces.py	2011-02-16 16:26:30 UTC (rev 120389)
@@ -295,11 +295,6 @@
         separate object.
         """
 
-class IConnectionPrivate(Interface):
-    """Private interface FBO persistent objects belonging to the connection.
-    """
-    _cache = Attribute("The pickle cache associated with this connection.")
-
 class IStorageWrapper(Interface):
     """Storage wrapper interface
 

Modified: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/tests/testConnection.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/ZODB/tests/testConnection.py	2011-02-16 15:54:28 UTC (rev 120388)
+++ ZODB/branches/tseaver-python_picklecache-2/src/ZODB/tests/testConnection.py	2011-02-16 16:26:30 UTC (rev 120389)
@@ -1226,11 +1226,6 @@
         from ZODB.interfaces import IConnection
         verifyClass(IConnection, self._getTargetClass())
 
-    def test_class_conforms_to_IConnectionPrivate(self):
-        from zope.interface.verify import verifyClass
-        from ZODB.interfaces import IConnectionPrivate
-        verifyClass(IConnectionPrivate, self._getTargetClass())
-
     def test_opened_connection_interface(self):
         # XXX This is really an integration test, but the dance to get a
         # connection created without it is pretty tedious.

Modified: ZODB/branches/tseaver-python_picklecache-2/src/persistent/interfaces.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/persistent/interfaces.py	2011-02-16 15:54:28 UTC (rev 120388)
+++ ZODB/branches/tseaver-python_picklecache-2/src/persistent/interfaces.py	2011-02-16 16:26:30 UTC (rev 120389)
@@ -350,6 +350,7 @@
     This interface is used by a persistent object to interact with its
     data manager in the context of a transaction.
     """
+    _cache = Attribute("The pickle cache associated with this connection.")
 
     def setstate(object):
         """Load the state for the given object.