[Checkins] SVN: relstorage/ Fixed compatibility with ZODB 3.10. As reported by J?\195?\188rgen Herrmann,

[Shane Hathaway]

Log message for revision 119945:
  Fixed compatibility with ZODB 3.10.  As reported by J?\195?\188rgen Herrmann,
  there was a problem with conflict errors.  The RelStorage patch of the
  sync() method now works with ZODB 3.10.
  

Changed:
  U   relstorage/branches/1.4/CHANGES.txt
  U   relstorage/branches/1.4/relstorage/__init__.py
  U   relstorage/trunk/CHANGES.txt
  U   relstorage/trunk/relstorage/__init__.py

-=-
Modified: relstorage/branches/1.4/CHANGES.txt
===================================================================
--- relstorage/branches/1.4/CHANGES.txt	2011-01-26 13:31:06 UTC (rev 119944)
+++ relstorage/branches/1.4/CHANGES.txt	2011-01-26 14:02:14 UTC (rev 119945)
@@ -1,3 +1,10 @@
+1.4.2 (Unreleased)
+------------------
+
+- Fixed compatibility with ZODB 3.10.  As reported by Jürgen Herrmann,
+  there was a problem with conflict errors.  The RelStorage patch of the
+  sync() method now works with ZODB 3.10.
+
 1.4.1 (2010-10-21)
 ------------------
 

Modified: relstorage/branches/1.4/relstorage/__init__.py
===================================================================
--- relstorage/branches/1.4/relstorage/__init__.py	2011-01-26 13:31:06 UTC (rev 119944)
+++ relstorage/branches/1.4/relstorage/__init__.py	2011-01-26 14:02:14 UTC (rev 119945)
@@ -35,6 +35,8 @@
     """
 
     def _storage_sync(self, *ignored, **kw):
+        if hasattr(self, '_readCurrent'):
+            self._readCurrent.clear()
         sync = getattr(self._storage, 'sync', 0)
         if sync:
             # By default, do not force the sync, allowing RelStorage

Modified: relstorage/trunk/CHANGES.txt
===================================================================
--- relstorage/trunk/CHANGES.txt	2011-01-26 13:31:06 UTC (rev 119944)
+++ relstorage/trunk/CHANGES.txt	2011-01-26 14:02:14 UTC (rev 119945)
@@ -17,6 +17,13 @@
 
 - Require setuptools or distribute.  Plain distutils is not sufficient.
 
+1.4.2 (Unreleased)
+------------------
+
+- Fixed compatibility with ZODB 3.10.  As reported by Jürgen Herrmann,
+  there was a problem with conflict errors.  The RelStorage patch of the
+  sync() method now works with ZODB 3.10.
+
 1.4.1 (2010-10-21)
 ------------------
 

Modified: relstorage/trunk/relstorage/__init__.py
===================================================================
--- relstorage/trunk/relstorage/__init__.py	2011-01-26 13:31:06 UTC (rev 119944)
+++ relstorage/trunk/relstorage/__init__.py	2011-01-26 14:02:14 UTC (rev 119945)
@@ -35,6 +35,8 @@
     """
 
     def _storage_sync(self, *ignored, **kw):
+        if hasattr(self, '_readCurrent'):
+            self._readCurrent.clear()
         sync = getattr(self._storage, 'sync', 0)
         if sync:
             # By default, do not force the sync, allowing RelStorage