[Zope-Checkins] CVS: Zope2 - FileStorage.py:1.57

jeremy@digicool.com jeremy@digicool.com
Wed, 9 May 2001 17:27:11 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/ZODB
In directory korak:/tmp/cvs-serv3152

Modified Files:
	FileStorage.py 
Log Message:
Simplify defn of UndoError.
Use types module rather than type().
Fix indentation nit.




--- Updated File FileStorage.py in package Zope2/lib/python/ZODB --
--- FileStorage.py	2001/05/02 21:22:37	1.56
+++ FileStorage.py	2001/05/09 21:27:10	1.57
@@ -189,8 +189,7 @@
 import struct, time, os, bpthread, string, base64, sys
 from struct import pack, unpack
 from cPickle import loads
-import POSException
-UndoError = POSException.UndoError
+from POSException import UndoError
 from TimeStamp import TimeStamp
 from lock_file import lock_file
 from utils import t32, p64, U64, cp
@@ -203,7 +202,7 @@
 try: from posix import fsync
 except: fsync=None
 
-StringType=type('')
+from types import StringType
 
 z64='\0'*8
 
@@ -238,7 +237,7 @@
 class CorruptedDataError(CorruptedFileStorageError): pass
 
 class FileStorageQuotaError(FileStorageError,
-                                POSException.StorageSystemError):
+                            POSException.StorageSystemError):
     """File storage quota exceeded
     """
 



--- Updated File FileStorage.py in package Zope2 --
--- FileStorage.py	2001/05/02 21:22:37	1.56
+++ FileStorage.py	2001/05/09 21:27:10	1.57
@@ -189,8 +189,7 @@
 import struct, time, os, bpthread, string, base64, sys
 from struct import pack, unpack
 from cPickle import loads
-import POSException
-UndoError = POSException.UndoError
+from POSException import UndoError
 from TimeStamp import TimeStamp
 from lock_file import lock_file
 from utils import t32, p64, U64, cp
@@ -203,7 +202,7 @@
 try: from posix import fsync
 except: fsync=None
 
-StringType=type('')
+from types import StringType
 
 z64='\0'*8
 
@@ -238,7 +237,7 @@
 class CorruptedDataError(CorruptedFileStorageError): pass
 
 class FileStorageQuotaError(FileStorageError,
-                                POSException.StorageSystemError):
+                            POSException.StorageSystemError):
     """File storage quota exceeded
     """