[Zodb-checkins] CVS: Zope/lib/python/ZODB - POSException.py:1.12.4.1 __init__.py:1.13.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv29520/lib/python/ZODB

Modified Files:
      Tag: chrism-install-branch
	POSException.py __init__.py 
Log Message:
More work on my Zope2 installer branch.  The branch is fully functional
at this point, at least on Linux (try it!).  The goal is to allow
a './configure; make; make install' Zope source installation possible. 

- The 'configure' step now checks for large file support
  and will only allow configuration to continue if you
  say "yes, I want to screw myself later." ;-)

- Replaced 'zctl' with Tres' 'zopectl'.  In the process,
  refactored zopectl so that it uses a Squid-like config file.
  The config file consists of "directives", each of
  which has a particular set of possible values explained
  in the config file.  The config file provides a uniform
  front-end to the mish-mash of environment variables
  and command-line switches that you normally need to
  deal with when you configure a Zope instance.

- Created a new package in software_home named Controller
  which holds the zctl libraries and some useful scripts
  to create directives.

- Merged HEAD changes onto branch.



=== Zope/lib/python/ZODB/POSException.py 1.12 => 1.12.4.1 ===
--- Zope/lib/python/ZODB/POSException.py:1.12	Wed Aug 14 18:07:09 2002
+++ Zope/lib/python/ZODB/POSException.py	Mon Aug 26 02:22:38 2002
@@ -21,23 +21,21 @@
 from ZODB import utils
 
 class POSError(Exception):
-    """Persistent object system error
-    """
+    """Persistent object system error."""
 
 class POSKeyError(KeyError, POSError):
-    """Key not found in database
-    """
+    """Key not found in database."""
 
     def __str__(self):
         return "%016x" % utils.U64(self.args[0])
 
 class TransactionError(POSError):
-    """An error occured due to normal transaction processing
-    """
+    """An error occured due to normal transaction processing."""
 
 class ConflictError(TransactionError):
-    """Two transactions tried to modify the same object at once.  This
-    transaction should be resubmitted.
+    """Two transactions tried to modify the same object at once.
+
+    This transaction should be resubmitted.
 
     Instance attributes:
       oid : string
@@ -108,9 +106,10 @@
 
 
 class ReadConflictError(ConflictError):
-    """A conflict detected at read time -- attempt to read an object
-    that has changed in another transaction (eg. another thread
-    or process).
+    """A conflict was detected at read time.
+
+    An attempt was made to read an object that has changed in another
+    transaction (eg. another thread or process).
     """
     def __init__(self, message=None, object=None, serials=None):
         if message is None:
@@ -119,27 +118,29 @@
                                serials=serials)
 
 class BTreesConflictError(ConflictError):
-    """A special subclass for BTrees conflict errors, which return
-    an undocumented four-tuple."""
+    """A special subclass for BTrees conflict errors.
+
+    These return an undocumented four-tuple.
+    """
     def __init__(self, *btree_args):
         ConflictError.__init__(self, message="BTrees conflict error")
         self.btree = btree_args
 
 class VersionError(POSError):
-    """An error in handling versions occurred
-    """
+    """An error in handling versions occurred."""
 
 class VersionCommitError(VersionError):
-    """An invalid combination of versions was used in a version commit
-    """
+    """An invalid combination of versions was used in a version commit."""
 
 class VersionLockError(VersionError, TransactionError):
-    """An attempt was made to modify an object that has
-    been modified in an unsaved version"""
+    """Modification to an object modified in an unsaved version.
 
-class UndoError(POSError):
-    """An attempt was made to undo a non-undoable transaction.
+    An attempt was made to modify an object that has been modified in an
+    unsaved version.
     """
+
+class UndoError(POSError):
+    """An attempt was made to undo a non-undoable transaction."""
     def __init__(self, *reason):
         if len(reason) == 1: reason=reason[0]
         self.__reason=reason
@@ -162,37 +163,31 @@
     __str__=__repr__
 
 class StorageError(POSError):
-    pass
+    """Base class for storage based exceptions."""
 
 class StorageTransactionError(StorageError):
-    """An operation was invoked for an invalid transaction or state
-    """
+    """An operation was invoked for an invalid transaction or state."""
 
 class StorageSystemError(StorageError):
-    """Panic! Internal storage error!
-    """
+    """Panic! Internal storage error!"""
 
 class MountedStorageError(StorageError):
-    """Unable to access mounted storage.
-    """
+    """Unable to access mounted storage."""
 
 class ReadOnlyError(StorageError):
-    """Unable to modify objects in a read-only storage.
-    """
+    """Unable to modify objects in a read-only storage."""
+
+class TransactionTooLargeError(StorageTransactionError):
+    """The transaction exhausted some finite storage resource."""
 
 class ExportError(POSError):
-    """An export file doesn't have the right format.
-    """
-    pass
+    """An export file doesn't have the right format."""
 
 class Unimplemented(POSError):
-    """An unimplemented feature was used
-    """
-    pass
+    """An unimplemented feature was used."""
 
 class Unsupported(POSError):
-    """An feature that is unsupported bt the storage was used.
-    """
+    """An feature that is unsupported bt the storage was used."""
 
 class InvalidObjectReference(POSError):
     """An object contains an invalid reference to another object.


=== Zope/lib/python/ZODB/__init__.py 1.13 => 1.13.4.1 ===
--- Zope/lib/python/ZODB/__init__.py:1.13	Wed Aug 14 18:07:09 2002
+++ Zope/lib/python/ZODB/__init__.py	Mon Aug 26 02:22:38 2002
@@ -11,8 +11,8 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-import sys, ExtensionClass, TimeStamp, cPersistence, Persistence
-import cStringIO, cPickle
+import sys
+import cPersistence, Persistence
 from zLOG import register_subsystem
 register_subsystem('ZODB')