openstack/deb-python-django-compressor
Code Issues Proposed changes

Minor nitpicking..

Browse Source
This commit is contained in:
Jannis Leidel
2011-11-25 16:55:40 +01:00
parent 9074c9b5aa
commit 86f98db217
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compressor/base.py
View File

@@ -64,13 +64,12 @@ class Compressor(object):
return basename.split("?", 1)[0] return basename.split("?", 1)[0]
def get_filepath(self, content, basename=None): def get_filepath(self, content, basename=None):
filename = "%s.%s" % (get_hexdigest(content, 12), self.type) parts = []
if basename is not None: if basename:
filename = '.'.join([ filename = os.path.split(basename)[1]
os.path.splitext(os.path.split(basename)[1])[0], parts.append(os.path.splitext(filename)[0])
filename parts.extend([get_hexdigest(content, 12), self.type])
]) return os.path.join(self.output_dir, self.output_prefix, '.'.join(parts))
return os.path.join(self.output_dir, self.output_prefix, filename)
def get_filename(self, basename): def get_filename(self, basename):
filename = None filename = None