[Zope3-checkins] CVS: Zope3/src/zodb - connection.py:1.1.2.3 db.py:1.1.2.3 dbdump.py:1.1.2.2 interfaces.py:1.1.2.3 serialize.py:1.1.2.2

[Barry Warsaw]

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

Modified Files:
      Tag: NameGeddon-branch
	connection.py db.py dbdump.py interfaces.py serialize.py 
Log Message:
more fixes

move threadedasync.py from the top level into zodb/zeo since it was
causing problems otherwise, and it's only used by zeo now.


=== Zope3/src/zodb/connection.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/connection.py:1.1.2.2	Mon Dec 23 16:52:52 2002
+++ Zope3/src/zodb/connection.py	Mon Dec 23 18:48:42 2002
@@ -227,7 +227,7 @@
         self._version = version
         self._cache = cache = Cache(cache_size)
         self._reader = ConnectionObjectReader(self, self._cache)
-        self._logger = logging.getLogger("ZODB")
+        self._logger = logging.getLogger("zodb")
 
         # _invalidated queues invalidate messages delivered from the DB
         # _inv_lock prevents one thread from modifying the set while


=== Zope3/src/zodb/db.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/db.py:1.1.2.2	Mon Dec 23 16:36:27 2002
+++ Zope3/src/zodb/db.py	Mon Dec 23 18:48:42 2002
@@ -293,7 +293,7 @@
         try:
             self._storage.pack(t)
         except:
-            logging.getLogger("ZODB").exception("packing")
+            logging.getLogger("zodb").exception("packing")
             raise
                            
     def setCacheSize(self, v):


=== Zope3/src/zodb/dbdump.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/dbdump.py:1.1.2.1	Mon Dec 23 14:30:43 2002
+++ Zope3/src/zodb/dbdump.py	Mon Dec 23 18:48:42 2002
@@ -45,7 +45,7 @@
                 fullclass = reader.getClassName(rec.data)
                 dig = md5.new(rec.data).hexdigest()
             # special case for testing purposes
-            if fullclass == "ZODB.tests.MinPO.MinPO":
+            if fullclass == "zodb.tests.minpo.MinPO":
                 obj = zodb_unpickle(rec.data)
                 fullclass = "%s %s" % (fullclass, obj.value)
             if rec.version:


=== Zope3/src/zodb/interfaces.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/interfaces.py:1.1.2.2	Mon Dec 23 16:37:31 2002
+++ Zope3/src/zodb/interfaces.py	Mon Dec 23 18:48:42 2002
@@ -23,7 +23,7 @@
 import zodb.utils
 
 def _fmt_oid(oid):
-    return "%016x" % ZODB.utils.u64(oid)
+    return "%016x" % zodb.utils.u64(oid)
 
 def _fmt_undo(oid, reason):
     s = reason and (": %s" % reason) or ""


=== Zope3/src/zodb/serialize.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/serialize.py:1.1.2.1	Mon Dec 23 14:30:43 2002
+++ Zope3/src/zodb/serialize.py	Mon Dec 23 18:48:42 2002
@@ -308,7 +308,7 @@
     try:
         u.noload()
     except EOFError, err:
-        logging.warn("ZODB: Bad pickled: %s", err)
+        logging.warn("zodb: Bad pickled: %s", err)
     # Iterator over L and convert persistent references to simple oids.
     oids = []
     for ref in L: