[Zodb-checkins] CVS: Zope3/src/zodb - connection.py:1.16 db.py:1.12 interfaces.py:1.14 lockfile.py:1.5
Albertas Agejevas
alga@codeworks.lt
Thu, 13 Mar 2003 13:49:27 -0500
Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv1411/src/zodb
Modified Files:
connection.py db.py interfaces.py lockfile.py
Log Message:
An unexpected raid by the Whitespace Police.
Other than fixes of nonconforming whitespace, just a couple of $Id$
docstrings has been added.
=== Zope3/src/zodb/connection.py 1.15 => 1.16 ===
--- Zope3/src/zodb/connection.py:1.15 Fri Mar 7 15:20:54 2003
+++ Zope3/src/zodb/connection.py Thu Mar 13 13:48:55 2003
@@ -123,12 +123,12 @@
# If no transaction is active, call get_transaction().
if self._txn is None:
self._txn = get_transaction()
- return self._txn
-
+ return self._txn
+
######################################################################
# IAppConnection defines the next three methods
# root(), sync(), get()
-
+
def root(self):
return self.get(z64)
@@ -217,7 +217,7 @@
# Helper method for setstate() handles possibly independent objects
# Call _p_independent(), if it returns True, setstate() wins.
# Otherwise, raise a ConflictError.
-
+
if obj._p_independent():
self._inv_lock.acquire()
try:
@@ -234,7 +234,7 @@
def register(self, obj):
if not self._registered:
self._get_transaction().join(self)
- self._registered.add(obj)
+ self._registered.add(obj)
def mtime(self, obj):
# required by the IPersistentDataManager interface, but unimplemented
@@ -285,7 +285,7 @@
msg = "connection closed while transaction active"
self._log.warn(msg)
raise TransactionError(msg)
- self._log.debug("connection closed")
+ self._log.debug("connection closed")
self._open = False
self._cache.incrgc()
# Return the connection to the pool.
=== Zope3/src/zodb/db.py 1.11 => 1.12 ===
--- Zope3/src/zodb/db.py:1.11 Thu Mar 6 15:49:47 2003
+++ Zope3/src/zodb/db.py Thu Mar 13 13:48:55 2003
@@ -43,7 +43,7 @@
# the database version number, a 4-byte string
version = "DB01"
-
+
def __init__(self, storage, pool_size=7, cache_size=400):
"""Create an object database.
@@ -72,7 +72,7 @@
self._pool_lock = Lock()
self._pool_lock.acquire()
self._pool_size = pool_size
-
+
self._cache_size = cache_size
# Setup storage
@@ -274,12 +274,12 @@
return
elif len(self._pool) == 1:
# Taking last one, lock the pool
-
+
# Note that another thread might grab the lock before
# us, so we might actually block, however, when we get
# the lock back, there *will* be a connection in the
# pool.
-
+
self._r()
self._pool_lock.acquire()
self._a()
=== Zope3/src/zodb/interfaces.py 1.13 => 1.14 ===
--- Zope3/src/zodb/interfaces.py:1.13 Thu Mar 6 16:02:27 2003
+++ Zope3/src/zodb/interfaces.py Thu Mar 13 13:48:55 2003
@@ -48,7 +48,7 @@
'MultipleUndoErrors',
'ExportError',
'Unsupported',
-
+
'IAppConnection',
'IConnection',
'ITransaction',
=== Zope3/src/zodb/lockfile.py 1.4 => 1.5 ===
--- Zope3/src/zodb/lockfile.py:1.4 Thu Feb 27 18:18:34 2003
+++ Zope3/src/zodb/lockfile.py Thu Mar 13 13:48:55 2003
@@ -25,7 +25,7 @@
import logging
def lock_file(file):
logging.warn('ZODB: No file-locking support on this platform')
-
+
# Windows
def lock_file(file):
# Lock just the first byte
@@ -45,7 +45,7 @@
pass
-
+
# This is a better interface to use than the lockfile.lock_file() interface.
# Creating the instance acquires the lock. The file remains open. Calling
# close both closes and unlocks the lock file.