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]
def get_filepath(self, content, basename=None):
filename = "%s.%s" % (get_hexdigest(content, 12), self.type)
if basename is not None:
filename = '.'.join([
os.path.splitext(os.path.split(basename)[1])[0],
filename
])
return os.path.join(self.output_dir, self.output_prefix, filename)
parts = []
if basename:
filename = os.path.split(basename)[1]
parts.append(os.path.splitext(filename)[0])
parts.extend([get_hexdigest(content, 12), self.type])
return os.path.join(self.output_dir, self.output_prefix, '.'.join(parts))
def get_filename(self, basename):
filename = None