From 7ade90ca9e825bddf9436d298dec0c9ec9eb0fe0 Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 20 Apr 2009 06:41:08 +0000 Subject: [PATCH] avoid error when no file is present git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3340 fd906abe-77d9-0310-91a1-e0d9ade77398 --- media/asset.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/media/asset.py b/media/asset.py index 95396e3..1becb85 100644 --- a/media/asset.py +++ b/media/asset.py @@ -83,10 +83,11 @@ class MediaAsset(MediaAssetFile, ExternalFileAdapter): return self.context.contentType or '' def getDataPath(self): - storage = component.getUtility(IExternalStorage, name=self.storageName) + storage = component.queryUtility(IExternalStorage, name=self.storageName) #print '***', self.storageName, self.storageParams, self.options - return storage.getDir(self.externalAddress, - self.storageParams['subdirectory']) + if storage is not None: + return storage.getDir(self.externalAddress, + self.storageParams['subdirectory']) def getOriginalData(self): return ExternalFileAdapter.getData(self) @@ -94,7 +95,9 @@ class MediaAsset(MediaAssetFile, ExternalFileAdapter): def getModified(self): d = getattr(self.context, '_modified', None) if not d: - return datetime.fromtimestamp(os.path.getmtime(self.getDataPath())) + dp = self.getDataPath() + if dp is not None: + return datetime.fromtimestamp(os.path.getmtime(dp)) return d def setModified(self, value): self.context._modified = value