[Zope3-checkins] CVS: ZODB4/src/zodb - connection.py:1.34.2.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv13907

Modified Files:
      Tag: ZODB3-2-merge
	connection.py 
Log Message:
Spell the state transitions the modern way.


=== ZODB4/src/zodb/connection.py 1.34.2.1 => 1.34.2.2 ===
--- ZODB4/src/zodb/connection.py:1.34.2.1	Tue Jun 17 17:59:25 2003
+++ ZODB4/src/zodb/connection.py	Wed Jun 18 11:48:52 2003
@@ -433,10 +433,10 @@
         if obj is None:
             return
         if serial == ResolvedSerial:
-            del obj._p_changed # transition from changed to ghost
+            obj._p_deactivate(force=True)
         else:
             if change:
-                obj._p_changed = 0 # trans. from changed to uptodate
+                obj._p_changed = False
             obj._p_serial = serial
 
     def _objcommit(self, obj, transaction):