[Zodb-checkins] SVN: ZODB/branches/3.3/ Merge rev 29450 from ZODB
trunk.
Tim Peters
tim.one at comcast.net
Fri Mar 11 19:14:36 EST 2005
Log message for revision 29451:
Merge rev 29450 from ZODB trunk.
ZODB is an XXX-free zone now.
Changed:
U ZODB/branches/3.3/doc/zdctl.txt
U ZODB/branches/3.3/src/Persistence/tests/test_mapping.py
U ZODB/branches/3.3/src/ZEO/TransactionBuffer.py
U ZODB/branches/3.3/src/ZEO/tests/zeoserver.py
U ZODB/branches/3.3/src/ZEO/zrpc/trigger.py
U ZODB/branches/3.3/src/ZODB/TmpStore.py
U ZODB/branches/3.3/src/ZODB/component.xml
U ZODB/branches/3.3/src/ZODB/tests/TransactionalUndoStorage.py
U ZODB/branches/3.3/src/ZODB/tests/VersionStorage.py
U ZODB/branches/3.3/src/ZODB/transact.py
U ZODB/branches/3.3/src/persistent/TimeStamp.c
U ZODB/branches/3.3/src/persistent/tests/test_pickle.py
U ZODB/branches/3.3/src/persistent/tests/test_wref.py
U ZODB/branches/3.3/src/persistent/wref.py
U ZODB/branches/3.3/src/scripts/zeoqueue.py
U ZODB/branches/3.3/src/scripts/zeoup.py
U ZODB/branches/3.3/src/transaction/_transaction.py
U ZODB/branches/3.3/src/transaction/tests/test_transaction.py
-=-
Modified: ZODB/branches/3.3/doc/zdctl.txt
===================================================================
--- ZODB/branches/3.3/doc/zdctl.txt 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/doc/zdctl.txt 2005-03-12 00:14:36 UTC (rev 29451)
@@ -326,10 +326,10 @@
zdctl reference
---------------
-XXX TBD
+TBD
zdrun reference
---------------
-XXX TBD
+TBD
Modified: ZODB/branches/3.3/src/Persistence/tests/test_mapping.py
===================================================================
--- ZODB/branches/3.3/src/Persistence/tests/test_mapping.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/Persistence/tests/test_mapping.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -11,8 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""XXX short summary goes here.
-
+"""
$Id$
"""
import unittest
Modified: ZODB/branches/3.3/src/ZEO/TransactionBuffer.py
===================================================================
--- ZODB/branches/3.3/src/ZEO/TransactionBuffer.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZEO/TransactionBuffer.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -44,7 +44,7 @@
# can happen in Python if one thread closes a file that another
# thread is reading. In a debug build, an assert() can fail.
- # XXX If an operation is performed on a closed TransactionBuffer,
+ # Caution: If an operation is performed on a closed TransactionBuffer,
# it has no effect and does not raise an exception. The only time
# this should occur is when a ClientStorage is closed in one
# thread while another thread is in its tpc_finish(). It's not
Modified: ZODB/branches/3.3/src/ZEO/tests/zeoserver.py
===================================================================
--- ZODB/branches/3.3/src/ZEO/tests/zeoserver.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZEO/tests/zeoserver.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -139,7 +139,7 @@
os.kill(pid, signal.SIGKILL)
else:
from ZEO.tests.forker import shutdown_zeo_server
- # XXX If the -k option was given to zeoserver, then the
+ # Nott: If the -k option was given to zeoserver, then the
# process will go away but the temp files won't get
# cleaned up.
shutdown_zeo_server(self._adminaddr)
@@ -167,7 +167,6 @@
zo.realize(["-C", configfile])
zeo_port = int(zo.address[1])
- # XXX a hack
if zo.auth_protocol == "plaintext":
import ZEO.tests.auth_plaintext
Modified: ZODB/branches/3.3/src/ZEO/zrpc/trigger.py
===================================================================
--- ZODB/branches/3.3/src/ZEO/zrpc/trigger.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZEO/zrpc/trigger.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -117,7 +117,7 @@
else:
- # XXX Should define a base class that has the common methods and
+ # TODO: Should define a base class that has the common methods and
# then put the platform-specific in a subclass named trigger.
# win32-safe version
Modified: ZODB/branches/3.3/src/ZODB/TmpStore.py
===================================================================
--- ZODB/branches/3.3/src/ZODB/TmpStore.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZODB/TmpStore.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -61,7 +61,7 @@
serial = h[:8]
return self._file.read(size), serial
- # XXX clarify difference between self._storage & self._db._storage
+ # TODO: clarify difference between self._storage & self._db._storage
def modifiedInVersion(self, oid):
if self._index.has_key(oid):
@@ -118,6 +118,6 @@
return ()
def versionEmpty(self, version):
- # XXX what is this supposed to do?
+ # TODO: what is this supposed to do?
if version == self._bver:
return len(self._index)
Modified: ZODB/branches/3.3/src/ZODB/component.xml
===================================================================
--- ZODB/branches/3.3/src/ZODB/component.xml 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZODB/component.xml 2005-03-12 00:14:36 UTC (rev 29451)
@@ -1,6 +1,6 @@
<component prefix="ZODB.config">
- <!-- XXX needs descriptions for everything -->
+ <!-- TODO needs descriptions for everything -->
<abstracttype name="ZODB.storage"/>
<abstracttype name="ZODB.database"/>
@@ -95,7 +95,7 @@
<key name="var">
<description>
The directory where persistent cache files are stored. By
- default cache files, if they are persistent, are stored in
+ default cache files, if they are persistent, are stored in
the current directory.
</description>
</key>
Modified: ZODB/branches/3.3/src/ZODB/tests/TransactionalUndoStorage.py
===================================================================
--- ZODB/branches/3.3/src/ZODB/tests/TransactionalUndoStorage.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZODB/tests/TransactionalUndoStorage.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -603,7 +603,7 @@
self._storage.pack(t, referencesf)
cn.sync()
- # XXX Is _cache supposed to have a clear() method, or not?
+ # TODO: Is _cache supposed to have a clear() method, or not?
# cn._cache.clear()
# The last undo set the value to 3 and pack should
Modified: ZODB/branches/3.3/src/ZODB/tests/VersionStorage.py
===================================================================
--- ZODB/branches/3.3/src/ZODB/tests/VersionStorage.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZODB/tests/VersionStorage.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -186,7 +186,7 @@
eq = self.assertEqual
oid, version = self._setup_version()
- # XXX Not sure I can write a test for getSerial() in the
+ # Not sure I can write a test for getSerial() in the
# presence of aborted versions, because FileStorage and
# Berkeley storage give a different answer. I think Berkeley
# is right and FS is wrong.
@@ -219,9 +219,8 @@
self._storage.tpc_begin(t)
# And try to abort the empty version
- if (hasattr(self._storage, 'supportsTransactionalUndo')
- and self._storage.supportsTransactionalUndo()):
- # XXX FileStorage used to be broken on this one
+ if (hasattr(self._storage, 'supportsTransactionalUndo') and
+ self._storage.supportsTransactionalUndo()):
self.assertRaises(POSException.VersionError,
self._storage.abortVersion,
'', t)
@@ -236,9 +235,8 @@
eq(zodb_unpickle(data), MinPO(51))
def checkCommitVersionErrors(self):
- if not (hasattr(self._storage, 'supportsTransactionalUndo')
- and self._storage.supportsTransactionalUndo()):
- # XXX FileStorage used to be broken on this one
+ if not (hasattr(self._storage, 'supportsTransactionalUndo') and
+ self._storage.supportsTransactionalUndo()):
return
eq = self.assertEqual
oid1, version1 = self._setup_version('one')
Modified: ZODB/branches/3.3/src/ZODB/transact.py
===================================================================
--- ZODB/branches/3.3/src/ZODB/transact.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/ZODB/transact.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -33,7 +33,7 @@
TransactionError occurs, the transaction will not be retried.
"""
- # XXX deal with ZEO disconnected errors?
+ # TODO: deal with ZEO disconnected errors?
def g(*args, **kwargs):
n = retries
Modified: ZODB/branches/3.3/src/persistent/TimeStamp.c
===================================================================
--- ZODB/branches/3.3/src/persistent/TimeStamp.c 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/persistent/TimeStamp.c 2005-03-12 00:14:36 UTC (rev 29451)
@@ -1,6 +1,6 @@
/*****************************************************************************
- Copyright (c) 2001, 2004 Zope Corporation and Contributors.
+ Copyright (c) 2001, 2004 Zope Corporation and Contributors.
All Rights Reserved.
This software is subject to the provisions of the Zope Public License,
@@ -43,7 +43,7 @@
static double gmoff=0;
-/* XXX should this be stored in sconv? */
+/* TODO: May be better (faster) to store in a file static. */
#define SCONV ((double)60) / ((double)(1<<16)) / ((double)(1<<16))
static int
@@ -121,7 +121,6 @@
register unsigned char *p = (unsigned char *)self->data;
register int len = 8;
register long x = *p << 7;
- /* XXX unroll loop? */
while (--len >= 0)
x = (1000003*x) ^ *p++;
x ^= 8;
@@ -131,7 +130,7 @@
}
typedef struct {
- /* XXX reverse-engineer what's in these things and comment them */
+ /* TODO: reverse-engineer what's in these things and comment them */
int y;
int m;
int d;
Modified: ZODB/branches/3.3/src/persistent/tests/test_pickle.py
===================================================================
--- ZODB/branches/3.3/src/persistent/tests/test_pickle.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/persistent/tests/test_pickle.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -71,7 +71,7 @@
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
>>> x.__setstate__({'z': 1})
@@ -121,8 +121,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
"""
@@ -160,8 +159,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
>>> x.s4 = 'spam'
@@ -177,8 +175,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
"""
@@ -212,8 +209,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
>>> x.s4 = 'spam'
@@ -230,8 +226,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
"""
@@ -252,8 +247,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
>>> x.s4 = 'spam'
@@ -270,8 +264,7 @@
1
>>> pickle.loads(pickle.dumps(x, 1)) == x
1
-
- XXX disable until Python 2.3.4 >>> pickle.loads(pickle.dumps(x, 2)) == x
+ >>> pickle.loads(pickle.dumps(x, 2)) == x
1
"""
Modified: ZODB/branches/3.3/src/persistent/tests/test_wref.py
===================================================================
--- ZODB/branches/3.3/src/persistent/tests/test_wref.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/persistent/tests/test_wref.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -11,8 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""XXX short summary goes here.
-
+"""
$Id$
"""
import unittest
Modified: ZODB/branches/3.3/src/persistent/wref.py
===================================================================
--- ZODB/branches/3.3/src/persistent/wref.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/persistent/wref.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -234,10 +234,9 @@
>>> db.close()
"""
- # XXX it is expensive trying to load dead objects from the database.
- # It would be helpful if the data manager/connection cached these.
+ # TODO: It's expensive trying to load dead objects from the database.
+ # It would be helpful if the data manager/connection cached these.
-
def __init__(self, adict=None, **kwargs):
self.data = {}
if adict is not None:
@@ -298,4 +297,4 @@
for k, v in adict.items():
self.data[WeakRef(k)] = v
- # XXX Someone else can fill out the rest of the methods, with tests. :)
+ # TODO: May need more methods, and tests.
Modified: ZODB/branches/3.3/src/scripts/zeoqueue.py
===================================================================
--- ZODB/branches/3.3/src/scripts/zeoqueue.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/scripts/zeoqueue.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -115,7 +115,7 @@
- The number of currently active transactions.
- The number of reported queued transactions.
- Client restarts.
- - Number of current connections. XXX (This might not be useful.)
+ - Number of current connections (but this might not be useful).
We can observe these events by reading the following sorts of log
entries:
@@ -191,7 +191,7 @@
if mo is None:
return
called_method = mo.group('method')
- # XXX exit earlier if we've got zeoLoad, because it's the most
+ # Exit early if we've got zeoLoad, because it's the most
# frequently called method and we don't use it.
if called_method == "zeoLoad":
return
Modified: ZODB/branches/3.3/src/scripts/zeoup.py
===================================================================
--- ZODB/branches/3.3/src/scripts/zeoup.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/scripts/zeoup.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -44,7 +44,7 @@
def check_server(addr, storage, write):
t0 = time.time()
if ZEO_VERSION == 2:
- # XXX should do retries w/ exponential backoff
+ # TODO: should do retries w/ exponential backoff.
cs = ClientStorage(addr, storage=storage, wait=0,
read_only=(not write))
else:
Modified: ZODB/branches/3.3/src/transaction/_transaction.py
===================================================================
--- ZODB/branches/3.3/src/transaction/_transaction.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/transaction/_transaction.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -54,7 +54,7 @@
The second argument to tpc_begin() indicates that a subtransaction
commit is beginning (if it is true). In a subtransaction, there is no
-tpc_vote() call. (XXX: I don't have any idea why.) The tpc_finish()
+tpc_vote() call (I don't know why not). The tpc_finish()
or tpc_abort() call applies just to that subtransaction.
Once a resource manager is involved in a subtransaction, all
@@ -128,9 +128,6 @@
commit. It calls afterCompletion() when a top-level transaction is
committed or aborted. The methods are passed the current Transaction
as their only argument.
-
-XXX This code isn't tested.
-
"""
import logging
Modified: ZODB/branches/3.3/src/transaction/tests/test_transaction.py
===================================================================
--- ZODB/branches/3.3/src/transaction/tests/test_transaction.py 2005-03-11 23:53:09 UTC (rev 29450)
+++ ZODB/branches/3.3/src/transaction/tests/test_transaction.py 2005-03-12 00:14:36 UTC (rev 29451)
@@ -203,7 +203,6 @@
assert self.nosub1._p_jar.ctpc_finish == 0
assert self.nosub1._p_jar.cabort == 1
- # XXX:
def BUGtestNSJSubTransactionCommitAbort(self):
"""
this reveals a bug in transaction.py
More information about the Zodb-checkins
mailing list