[Zope-Checkins] CVS: Zope27/lib/python/ZODB - ConflictResolution.py:1.9.60.1
Fred L. Drake, Jr.
fdrake@acm.org
Tue, 20 Aug 2002 16:17:33 -0400
Update of /cvs-repository/Zope27/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv8829/ZODB
Modified Files:
Tag: Zope-2_7-development-branch
ConflictResolution.py
Log Message:
Remove unnecessary aliasing. Python 2.3 issues a SyntaxWarning when binding
to the name None.
=== Zope27/lib/python/ZODB/ConflictResolution.py 1.9 => 1.9.60.1 ===
--- Zope27/lib/python/ZODB/ConflictResolution.py:1.9 Mon Feb 11 18:40:42 2002
+++ Zope27/lib/python/ZODB/ConflictResolution.py Tue Aug 20 16:17:33 2002
@@ -55,8 +55,7 @@
data=None
- def __call__(self, oid,
- getattr=getattr, None=None):
+ def __call__(self, oid):
data=self.data
if not data: data=self.data={}