[Zodb-checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.14

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv28206

Modified Files:
	ConflictResolution.py 
Log Message:
Add missing import of sys, needed for error logging in except clause
in load_class().  Found by pychecker.


=== ZODB3/ZODB/ConflictResolution.py 1.13 => 1.14 ===
--- ZODB3/ZODB/ConflictResolution.py:1.13	Thu Aug 15 11:48:55 2002
+++ ZODB3/ZODB/ConflictResolution.py	Fri Sep 27 14:35:09 2002
@@ -11,6 +11,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+import sys
 from cStringIO import StringIO
 from cPickle import Unpickler, Pickler