[Zodb-checkins] CVS: Zope3/src/zodb/code - module.py:1.8.8.1 class_.py:1.11.2.1

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb/code
In directory cvs.zope.org:/tmp/cvs-serv28205/code

Modified Files:
      Tag: opaque-pickles-branch
	module.py class_.py 
Log Message:
Update from trunk.


=== Zope3/src/zodb/code/module.py 1.8 => 1.8.8.1 ===
--- Zope3/src/zodb/code/module.py:1.8	Tue Jan 28 16:24:32 2003
+++ Zope3/src/zodb/code/module.py	Wed Mar 12 16:38:42 2003
@@ -15,7 +15,6 @@
 
 __metaclass__ = type
 
-import __builtin__
 # in 2.3, this will be spelled new.function
 from types import FunctionType as function
 import sys
@@ -128,7 +127,7 @@
             self._module = PersistentModule(name)
         try:
             self._registry.setModule(name, self._module)
-        except ValueError, err:
+        except ValueError:
             self._module = None
             raise
         self.name = name


=== Zope3/src/zodb/code/class_.py 1.11 => 1.11.2.1 ===
--- Zope3/src/zodb/code/class_.py:1.11	Thu Feb  6 12:41:19 2003
+++ Zope3/src/zodb/code/class_.py	Wed Mar 12 16:38:42 2003
@@ -369,8 +369,6 @@
         # If the class has a jar but no oid, it's a new object
         # and doesn't have state in the database.
 
-        # XXX Why would an object be marked a ghost, have a jar, and
-        # not have an oid?
         if cls._p_state == GHOST and cls._pc_init:
             dm = cls._p_jar
             if dm is not None and cls._p_oid: