[Zodb-checkins] CVS: ZODB3/ZEO - ClientStub.py:1.8 CommitLog.py:1.3 Exceptions.py:1.5 ICache.py:1.3 ServerStub.py:1.6 StorageServer.py:1.46 TransactionBuffer.py:1.5 __init__.py:1.11 smac.py:1.21 start.py:1.43 util.py:1.3
Guido van Rossum
guido@python.org
Thu, 29 Aug 2002 12:31:17 -0400
Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv16022
Modified Files:
ClientStub.py CommitLog.py Exceptions.py ICache.py
ServerStub.py StorageServer.py TransactionBuffer.py
__init__.py smac.py start.py util.py
Log Message:
Whitespace cleanup.
=== ZODB3/ZEO/ClientStub.py 1.7 => 1.8 ===
--- ZODB3/ZEO/ClientStub.py:1.7 Thu Aug 29 12:15:50 2002
+++ ZODB3/ZEO/ClientStub.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Stub for interface exported by ClientStorage"""
=== ZODB3/ZEO/CommitLog.py 1.2 => 1.3 ===
--- ZODB3/ZEO/CommitLog.py:1.2 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/CommitLog.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Log a transaction's commit info during two-phase commit.
@@ -44,4 +44,3 @@
self.read = 1
self.file.seek(0)
return self.stores, cPickle.Unpickler(self.file)
-
=== ZODB3/ZEO/Exceptions.py 1.4 => 1.5 ===
--- ZODB3/ZEO/Exceptions.py:1.4 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/Exceptions.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Exceptions for ZEO."""
=== ZODB3/ZEO/ICache.py 1.2 => 1.3 ===
--- ZODB3/ZEO/ICache.py:1.2 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/ICache.py Thu Aug 29 12:31:17 2002
@@ -17,7 +17,7 @@
client -- a string; if specified, cache is persistent.
var -- var directory to store cache files in
"""
-
+
def open():
"""Returns a sequence of object info tuples.
@@ -75,9 +75,3 @@
size is a hint about the amount of data that is about to be
stored. The cache may want to evict some data to make space.
"""
-
-
-
-
-
-
=== ZODB3/ZEO/ServerStub.py 1.5 => 1.6 ===
--- ZODB3/ZEO/ServerStub.py:1.5 Thu Jun 27 11:06:17 2002
+++ ZODB3/ZEO/ServerStub.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Stub for interface exposed by StorageServer"""
=== ZODB3/ZEO/StorageServer.py 1.45 => 1.46 ===
--- ZODB3/ZEO/StorageServer.py:1.45 Wed Aug 28 12:37:09 2002
+++ ZODB3/ZEO/StorageServer.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Network ZODB storage server
@@ -114,7 +114,7 @@
class ZEOStorage:
"""Proxy to underlying storage for a single remote client."""
-
+
def __init__(self, server):
self.server = server
self.client = None
@@ -305,7 +305,7 @@
else:
self.strategy = DelayedCommitStrategy(self.__storage,
self.wait)
-
+
t = Transaction()
t.id = id
t.user = user
@@ -365,7 +365,7 @@
# the finishing transaction's reply before restarting the waiting
# transaction. If the restart takes a long time, the previous
# client will be blocked until it finishes.
-
+
def wait(self):
if self.__storage._transaction:
d = Delay()
@@ -401,7 +401,7 @@
return 0
else:
return 1
-
+
def restart(self, delay=None):
old_strategy = self.strategy
self.strategy = ImmediateCommitStrategy(self.__storage,
=== ZODB3/ZEO/TransactionBuffer.py 1.4 => 1.5 ===
--- ZODB3/ZEO/TransactionBuffer.py:1.4 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/TransactionBuffer.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""A TransactionBuffer store transaction updates until commit or abort.
@@ -35,12 +35,12 @@
self.pickler = cPickle.Pickler(self.file, 1)
self.pickler.fast = 1
- def close(self):
+ def close(self):
try:
self.file.close()
except OSError:
pass
-
+
def store(self, oid, version, data):
"""Store oid, version, data for later retrieval"""
=== ZODB3/ZEO/__init__.py 1.10 => 1.11 ===
--- ZODB3/ZEO/__init__.py:1.10 Mon Aug 5 15:09:54 2002
+++ ZODB3/ZEO/__init__.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
version = "2.0b1"
=== ZODB3/ZEO/smac.py 1.20 => 1.21 ===
--- ZODB3/ZEO/smac.py:1.20 Wed Aug 28 14:24:50 2002
+++ ZODB3/ZEO/smac.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Sized message async connections
=== ZODB3/ZEO/start.py 1.42 => 1.43 ===
--- ZODB3/ZEO/start.py:1.42 Tue Aug 27 14:43:12 2002
+++ ZODB3/ZEO/start.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Start the server storage.
@@ -217,7 +217,7 @@
os.environ['STUPID_LOG_SEVERITY'] = '-300'
set_uid(UID)
-
+
if Z:
try:
import posix
@@ -230,7 +230,7 @@
try:
import ZEO.StorageServer, asyncore
-
+
storages = {}
for o, v in opts:
if o == '-S':
@@ -259,14 +259,14 @@
unix = host, port
ZEO.StorageServer.StorageServer(unix, storages)
-
+
try:
ppid, pid = os.getppid(), os.getpid()
except:
pass # getpid not supported
else:
open(env.zeo_pid,'w').write("%s %s" % (ppid, pid))
-
+
except:
# Log startup exception and tell zdaemon not to restart us.
info = sys.exc_info()
@@ -277,9 +277,9 @@
import traceback
traceback.print_exception(*info)
-
+
sys.exit(0)
-
+
try:
asyncore.loop()
except SystemExit:
=== ZODB3/ZEO/util.py 1.2 => 1.3 ===
--- ZODB3/ZEO/util.py:1.2 Fri Aug 16 14:16:07 2002
+++ ZODB3/ZEO/util.py Thu Aug 29 12:31:17 2002
@@ -2,14 +2,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
-#
+#
##############################################################################
"""Utilities for setting up the server environment."""
@@ -45,6 +45,6 @@
pid = os.environ.get("ZEO_SERVER_PID")
if pid is None:
pid = os.path.join(self.var, "ZEO_SERVER.pid")
- self.zeo_pid = pid
-
+ self.zeo_pid = pid
+
self.fs = os.path.join(self.var, "Data.fs")