[Checkins] SVN: ZODB/trunk/src/ZEO/ClientStorage.py Delay import of ZODB.Blobs.Blob to avoid a dependency on pywin32 on

Jim Fulton jim at zope.com
Fri May 11 18:42:53 EDT 2007


Log message for revision 75694:
  Delay import of ZODB.Blobs.Blob to avoid a dependency on pywin32 on
  Windows when Blobs aren't used.
  

Changed:
  U   ZODB/trunk/src/ZEO/ClientStorage.py

-=-
Modified: ZODB/trunk/src/ZEO/ClientStorage.py
===================================================================
--- ZODB/trunk/src/ZEO/ClientStorage.py	2007-05-11 22:18:37 UTC (rev 75693)
+++ ZODB/trunk/src/ZEO/ClientStorage.py	2007-05-11 22:42:53 UTC (rev 75694)
@@ -39,7 +39,6 @@
 from ZODB import utils
 from ZODB.loglevels import BLATHER
 from ZODB.Blobs.interfaces import IBlobStorage
-from ZODB.Blobs.Blob import FilesystemHelper
 from persistent.TimeStamp import TimeStamp
 
 logger = logging.getLogger('ZEO.ClientStorage')
@@ -321,7 +320,10 @@
         self.blob_dir = blob_dir
         self.blob_cache_writable = blob_cache_writable
         if blob_dir is not None:
-            self.fshelper = FilesystemHelper(blob_dir)
+            # Avoid doing this import unless we need it, as it
+            # currently requires pywin32 on Windows.
+            import ZODB.Blobs.Blob 
+            self.fshelper = ZODB.Blobs.Blob.FilesystemHelper(blob_dir)
             self.fshelper.create()
             self.fshelper.checkSecure()
         else:



More information about the Checkins mailing list