[Zope-Checkins] CVS: ZODB3/ZODB - fspack.py:1.5
Jeremy Hylton
jeremy@zope.com
Tue, 13 May 2003 12:29:22 -0400
Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv21516
Modified Files:
fspack.py
Log Message:
Python 2.1 compatibility. "in" does not correspond to "has_key" in
2.1.
=== ZODB3/ZODB/fspack.py 1.4 => 1.5 ===
--- ZODB3/ZODB/fspack.py:1.4 Thu May 8 18:43:49 2003
+++ ZODB3/ZODB/fspack.py Tue May 13 12:29:21 2003
@@ -481,7 +481,7 @@
todo = list(roots)
while todo:
oid = todo.pop()
- if oid in self.reachable:
+ if self.reachable.has_key(oid):
continue
L = []
@@ -525,7 +525,7 @@
self.checkData(th, tpos, dh, pos)
if dh.back and dh.back < self.packpos:
- if dh.oid in self.reachable:
+ if self.reachable.has_key(dh.oid):
L = self.reach_ex.setdefault(dh.oid, [])
if dh.back not in L:
L.append(dh.back)
@@ -534,7 +534,7 @@
self.reachable[dh.oid] = dh.back
if dh.version and dh.pnv:
- if dh.oid in self.reachable:
+ if self.reachable.has_key(dh.oid):
L = self.reach_ex.setdefault(dh.oid, [])
if dh.pnv not in L:
L.append(dh.pnv)