Commit 7ab4d542 authored by Hanno Schlichting's avatar Hanno Schlichting

PEP8 cleanup

parent f1fe0d88
...@@ -32,17 +32,17 @@ from ZPublisher.Iterators import filestream_iterator ...@@ -32,17 +32,17 @@ from ZPublisher.Iterators import filestream_iterator
import Zope2 import Zope2
PREFIX = os.path.realpath( PREFIX = os.path.realpath(
os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir) os.path.join(os.path.dirname(Zope2.__file__), os.path.pardir))
)
NON_PREFIX_WARNING = ('Assuming image location to be present in the Zope2 ' NON_PREFIX_WARNING = ('Assuming image location to be present in the Zope2 '
'distribution. This is deprecated and might lead to ' 'distribution. This is deprecated and might lead to '
'broken code if the directory in question is moved ' 'broken code if the directory in question is moved '
'to another distribution. Please provide either an ' 'to another distribution. Please provide either an '
'absolute file system path or a prefix. Support for ' 'absolute file system path or a prefix. Support for '
'relative filenames without a prefix might be ' 'relative filenames without a prefix might be '
'dropped in a future Zope2 release.') 'dropped in a future Zope2 release.')
class ImageFile(Explicit): class ImageFile(Explicit):
"""Image objects stored in external files.""" """Image objects stored in external files."""
...@@ -53,7 +53,7 @@ class ImageFile(Explicit): ...@@ -53,7 +53,7 @@ class ImageFile(Explicit):
if _prefix is None: if _prefix is None:
_prefix=getattr(getConfiguration(), 'softwarehome', None) or PREFIX _prefix=getattr(getConfiguration(), 'softwarehome', None) or PREFIX
if not os.path.isabs(path): if not os.path.isabs(path):
warnings.warn(NON_PREFIX_WARNING, UserWarning, 2 ) warnings.warn(NON_PREFIX_WARNING, UserWarning, 2)
elif type(_prefix) is not type(''): elif type(_prefix) is not type(''):
_prefix=package_home(_prefix) _prefix=package_home(_prefix)
# _prefix is ignored if path is absolute # _prefix is ignored if path is absolute
...@@ -82,7 +82,7 @@ class ImageFile(Explicit): ...@@ -82,7 +82,7 @@ class ImageFile(Explicit):
self.content_type=content_type self.content_type=content_type
else: else:
ext = os.path.splitext(path)[-1].replace('.', '') ext = os.path.splitext(path)[-1].replace('.', '')
self.content_type='image/%s' % ext self.content_type = 'image/%s' % ext
self.__name__ = os.path.split(path)[-1] self.__name__ = os.path.split(path)[-1]
stat_info = os.stat(path) stat_info = os.stat(path)
...@@ -108,8 +108,10 @@ class ImageFile(Explicit): ...@@ -108,8 +108,10 @@ class ImageFile(Explicit):
# with common servers such as Apache (which can usually # with common servers such as Apache (which can usually
# understand the screwy date string as a lucky side effect # understand the screwy date string as a lucky side effect
# of the way they parse it). # of the way they parse it).
try: mod_since=long(DateTime(header).timeTime()) try:
except: mod_since=None mod_since = long(DateTime(header).timeTime())
except:
mod_since = None
if mod_since is not None: if mod_since is not None:
if getattr(self, 'lmt', None): if getattr(self, 'lmt', None):
last_mod = long(self.lmt) last_mod = long(self.lmt)
......
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