[Zodb-checkins] CVS: Zope3/lib/python/ZODB - ConflictResolution.py:1.7.30.6 DB.py:1.34.4.11

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv5490/lib/python/ZODB

Modified Files:
      Tag: Zope-3x-branch
	ConflictResolution.py DB.py 
Log Message:
Implemented 

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/IContainerPythonification

Along the way:

- Converted most uses of has_key to use in.

- Fixed a bug in Interface names and namesAndDescriptions methods 
  that caused base class attributes to be missed.



=== Zope3/lib/python/ZODB/ConflictResolution.py 1.7.30.5 => 1.7.30.6 ===
 bad_classes={}
 def bad_class(class_tuple):
-    if bad_classes.has_key(class_tuple) or class_tuple[0][0] == '*':
+    if (class_tuple in bad_classes) or class_tuple[0][0] == '*':
         # if we've seen the class before or if it's a ZClass, we know that
         # we can't resolve the conflict
         return 1


=== Zope3/lib/python/ZODB/DB.py 1.34.4.10 => 1.34.4.11 ===
         return v
 
-    def objectCount(self): return len(self._storage)
+    def __len__(self):
+        return len(self._storage)
         
     def open(self, version='', transaction=None, temporary=0, force=None,
              waitflag=1):