[Zope-Checkins] CVS: ZODB3/Tools - analyze.py:1.1.32.1 checkbtrees.py:1.1.32.1 fsrefs.py:1.7.6.1 fstest.py:1.9.8.1 netspace.py:1.1.44.1 parsezeolog.py:1.4.18.1 zeopack.py:1.8.16.1 zeoreplay.py:1.3.18.1 zeoup.py:1.13.18.2
Tim Peters
tim.one@comcast.net
Tue, 1 Jul 2003 16:57:39 -0400
Update of /cvs-repository/ZODB3/Tools
In directory cvs.zope.org:/tmp/cvs-serv9924/Tools
Modified Files:
Tag: zodb33-devel-branch
analyze.py checkbtrees.py fsrefs.py fstest.py netspace.py
parsezeolog.py zeopack.py zeoreplay.py zeoup.py
Log Message:
Whitespace normalization.
=== ZODB3/Tools/analyze.py 1.1 => 1.1.32.1 ===
--- ZODB3/Tools/analyze.py:1.1 Mon Aug 26 14:29:58 2002
+++ ZODB3/Tools/analyze.py Tue Jul 1 16:57:06 2003
@@ -137,4 +137,3 @@
if __name__ == "__main__":
path = sys.argv[1]
report(analyze(path))
-
=== ZODB3/Tools/checkbtrees.py 1.1 => 1.1.32.1 ===
--- ZODB3/Tools/checkbtrees.py:1.1 Thu Jun 20 18:49:50 2002
+++ ZODB3/Tools/checkbtrees.py Tue Jul 1 16:57:06 2003
@@ -25,7 +25,7 @@
attrs = ()
for pair in attrs:
sub.append(pair)
-
+
# what if it is a mapping?
try:
items = obj.items()
=== ZODB3/Tools/fsrefs.py 1.7 => 1.7.6.1 ===
--- ZODB3/Tools/fsrefs.py:1.7 Fri May 23 17:30:31 2003
+++ ZODB3/Tools/fsrefs.py Tue Jul 1 16:57:06 2003
@@ -4,14 +4,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Check FileStorage for dangling references.
@@ -77,7 +77,7 @@
# that refer to this one, we won't get error reports from
# them. We could fix this by making two passes over the
# storage, but that seems like overkill.
-
+
refs = get_refs(data)
missing = [] # contains 3-tuples of oid, klass-metadata, reason
for info in refs:
=== ZODB3/Tools/fstest.py 1.9 => 1.9.8.1 ===
--- ZODB3/Tools/fstest.py:1.9 Tue Apr 22 13:58:24 2003
+++ ZODB3/Tools/fstest.py Tue Jul 1 16:57:06 2003
@@ -4,14 +4,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Simple consistency checker for FileStorage.
@@ -109,7 +109,7 @@
It also leaves the file pointer set to pos. The path argument is
used for generating error messages.
"""
-
+
h = file.read(TREC_HDR_LEN)
if not h:
return None, None
@@ -131,7 +131,7 @@
raise FormatError("%s truncated possibly because of"
" damaged records at %s" % (path, pos))
if status == Status.checkpoint:
- raise FormatError("%s checkpoint flag was not cleared at %s"
+ raise FormatError("%s checkpoint flag was not cleared at %s"
% (path, pos))
if status not in ' up':
raise FormatError("%s has invalid status '%s' at %s" %
=== ZODB3/Tools/netspace.py 1.1 => 1.1.44.1 ===
--- ZODB3/Tools/netspace.py:1.1 Fri May 3 16:33:22 2002
+++ ZODB3/Tools/netspace.py Tue Jul 1 16:57:06 2003
@@ -89,7 +89,7 @@
keys = filter(paths.has_key, keys)
fmt = "%8s %5d %8d %s %s.%s"
-
+
for oid in keys:
data, serialno = fs.load(oid, '')
mod, klass = get_pickle_metadata(data)
=== ZODB3/Tools/parsezeolog.py 1.4 => 1.4.18.1 ===
--- ZODB3/Tools/parsezeolog.py:1.4 Thu Dec 12 16:34:37 2002
+++ ZODB3/Tools/parsezeolog.py Tue Jul 1 16:57:06 2003
@@ -52,7 +52,7 @@
fields = ("time", "vote", "done", "user", "path")
fmt = "%-24s %5s %5s %-15s %s"
hdr = fmt % fields
-
+
def report(self):
"""Print a report about the transaction"""
t = time.ctime(self.begin)
@@ -98,7 +98,7 @@
except KeyError:
print "uknown tid", repr(tid)
return None
-
+
def tpc_finish(self, time, args):
t = self.get_txn(args)
if t is None:
=== ZODB3/Tools/zeopack.py 1.8 => 1.8.16.1 ===
--- ZODB3/Tools/zeopack.py:1.8 Tue Jan 28 16:20:40 2003
+++ ZODB3/Tools/zeopack.py Tue Jul 1 16:57:06 2003
@@ -6,11 +6,11 @@
Options:
-p port -- port to connect to
-
+
-h host -- host to connect to (default is current host)
-
+
-U path -- Unix-domain socket to connect to
-
+
-S name -- storage name (default is '1')
-d days -- pack objects more than days old
=== ZODB3/Tools/zeoreplay.py 1.3 => 1.3.18.1 ===
--- ZODB3/Tools/zeoreplay.py:1.3 Wed Dec 18 17:15:03 2002
+++ ZODB3/Tools/zeoreplay.py Tue Jul 1 16:57:06 2003
@@ -186,7 +186,7 @@
meth = getattr(txn, 'tpc_begin', None)
if meth is not None:
meth(when, args, client)
-
+
def storea(self, when, args, client):
txn = self.__curtxn.get(client)
if txn is None:
@@ -221,7 +221,7 @@
print '%s %s %4d %10d %s %s' % (
txn._begintime, txn._finishtime - txn._begintime,
len(txn._objects),
- bytes,
+ bytes,
time.ctime(txn._begintime),
txn._url)
@@ -281,7 +281,7 @@
if replay:
storage = FileStorage(storagefile)
- #storage = BDBFullStorage(storagefile)
+ #storage = BDBFullStorage(storagefile)
#storage = PrimaryStorage('yyz', storage, RS_PORT)
t0 = now()
p = ZEOParser(maxtxns, report, storage)
=== ZODB3/Tools/zeoup.py 1.13.18.1 => 1.13.18.2 ===
--- ZODB3/Tools/zeoup.py:1.13.18.1 Tue Jul 1 16:55:41 2003
+++ ZODB3/Tools/zeoup.py Tue Jul 1 16:57:06 2003
@@ -11,11 +11,11 @@
Options:
-p port -- port to connect to
-
+
-h host -- host to connect to (default is current host)
-S storage -- storage name (default '1')
-
+
-U path -- Unix-domain socket to connect to
--nowrite -- Do not update the zeoup counter.