Commit 72818b0b authored by Jim Fulton's avatar Jim Fulton

Delay import of ZODB.Blobs.Blob to avoid a dependency on pywin32 on

Windows when Blobs aren't used.
parent e4d007cb
...@@ -39,7 +39,6 @@ from ZODB import POSException ...@@ -39,7 +39,6 @@ from ZODB import POSException
from ZODB import utils from ZODB import utils
from ZODB.loglevels import BLATHER from ZODB.loglevels import BLATHER
from ZODB.Blobs.interfaces import IBlobStorage from ZODB.Blobs.interfaces import IBlobStorage
from ZODB.Blobs.Blob import FilesystemHelper
from persistent.TimeStamp import TimeStamp from persistent.TimeStamp import TimeStamp
logger = logging.getLogger('ZEO.ClientStorage') logger = logging.getLogger('ZEO.ClientStorage')
...@@ -321,7 +320,10 @@ class ClientStorage(object): ...@@ -321,7 +320,10 @@ class ClientStorage(object):
self.blob_dir = blob_dir self.blob_dir = blob_dir
self.blob_cache_writable = blob_cache_writable self.blob_cache_writable = blob_cache_writable
if blob_dir is not None: 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.create()
self.fshelper.checkSecure() self.fshelper.checkSecure()
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment