[Zope3-checkins] CVS: Zope3/src/zodb/zeo - stubs.py:1.3.4.2 client.py:1.3.4.3

Jeremy Hylton jeremy@zope.com
Wed, 5 Feb 2003 15:58:07 -0500


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

Modified Files:
      Tag: storage-interface-branch
	stubs.py client.py 
Log Message:
Guido caught a renaming I missed: new_oids -> newObjectIds


=== Zope3/src/zodb/zeo/stubs.py 1.3.4.1 => 1.3.4.2 ===
--- Zope3/src/zodb/zeo/stubs.py:1.3.4.1	Wed Feb  5 12:30:05 2003
+++ Zope3/src/zodb/zeo/stubs.py	Wed Feb  5 15:58:03 2003
@@ -112,12 +112,6 @@
     def endZeoVerify(self):
         self.rpc.callAsync('endZeoVerify')
 
-    def new_oids(self, n=None):
-        if n is None:
-            return self.rpc.call('newObjectIds')
-        else:
-            return self.rpc.call('newObjectIds', n)
-
     def pack(self, t, wait=None):
         if wait is None:
             self.rpc.call('pack', t)
@@ -162,6 +156,12 @@
 
     def modifiedInVersion(self, oid):
         return self.rpc.call('modifiedInVersion', oid)
+
+    def newObjectIds(self, n=None):
+        if n is None:
+            return self.rpc.call('newObjectIds')
+        else:
+            return self.rpc.call('newObjectIds', n)
 
     def newObjectId(self, last=None):
         if last is None:


=== Zope3/src/zodb/zeo/client.py 1.3.4.2 => 1.3.4.3 ===
--- Zope3/src/zodb/zeo/client.py:1.3.4.2	Wed Feb  5 12:30:05 2003
+++ Zope3/src/zodb/zeo/client.py	Wed Feb  5 15:58:03 2003
@@ -244,7 +244,7 @@
         # variable should only be modified while holding the
         # _oid_lock.
         self._oid_lock = threading.Lock()
-        self._oids = [] # Object ids retrieved from new_oids()
+        self._oids = [] # Object ids retrieved from newObjectIds()
 
         t = self._ts = get_timestamp()
         self._serial = `t`
@@ -561,7 +561,7 @@
         self._oid_lock.acquire()
         try:
             if not self._oids:
-                self._oids = self._server.new_oids()
+                self._oids = self._server.newObjectIds()
                 self._oids.reverse()
             return self._oids.pop()
         finally: