[Zope-CVS] CVS: Products/Ape/apelib/zope2/setup - patches.py:1.3

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/apelib/zope2/setup
In directory cvs.zope.org:/tmp/cvs-serv14924

Modified Files:
	patches.py 
Log Message:
Removed unused imports and reformatted a complex condition

=== Products/Ape/apelib/zope2/setup/patches.py 1.2 => 1.3 ===
--- Products/Ape/apelib/zope2/setup/patches.py:1.2	Sat Mar 29 14:44:57 2003
+++ Products/Ape/apelib/zope2/setup/patches.py	Sat Mar 29 14:51:15 2003
@@ -16,13 +16,7 @@
 $Id$
 """
 
-from __future__ import nested_scopes
-
-from cPickle import Pickler, Unpickler
-from cStringIO import StringIO
-
 from Acquisition import aq_base
-from DateTime import DateTime
 
 from apelib.zodb3.utils import copyOf
 
@@ -45,8 +39,9 @@
     # Fall back to copying when move/rename is not possible.
     def _setOb(self, id, object):
         if object._p_oid is not None:
-            if (getattr(self, '_use_fixed_oids_', 0) or (
-                object._p_jar is not None and object._p_jar != self._p_jar)):
+            if (getattr(self, '_use_fixed_oids_', 0)
+                or (object._p_jar is not None
+                    and object._p_jar is not self._p_jar)):
                 old = object
                 # Forget changes to the original object
                 old._p_changed = 0