Merge remote-tracking branch 'wil/master'

ixc · Mar 10, 2011 · 4130e0c · 4130e0c
2 parents 63b00dc + cd08d1e
commit 4130e0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/compressor/filters/css_default.py b/compressor/filters/css_default.py
@@ -12,9 +12,9 @@
 class CssAbsoluteFilter(FilterBase):
     def input(self, filename=None, media_url=None, **kwargs):
         media_url = media_url or settings.MEDIA_URL
-        media_root = os.path.abspath(settings.MEDIA_ROOT)
+        media_root = os.path.realpath(settings.MEDIA_ROOT)
         if filename is not None:
-            filename = os.path.abspath(filename)
+            filename = os.path.realpath(filename)
         if not filename or not filename.startswith(media_root):
             return self.content
         self.media_path = filename[len(media_root):]
@@ -54,4 +54,4 @@ def url_converter(self, matchobj):
         full_url = posixpath.normpath(full_url)
         if self.has_http:
             full_url = "%s%s" % (self.protocol, full_url)
-        return "url('%s')" % self.add_mtime(full_url)
+        return "url('%s')" % self.add_mtime(full_url)
diff --git a/compressor/utils.py b/compressor/utils.py
@@ -8,12 +8,11 @@ def get_hexdigest(plaintext):
     return sha_constructor(p).hexdigest()
 
 def get_file_hash(filename):
-    media_root = os.path.abspath(settings.MEDIA_ROOT)
+    media_root = os.path.realpath(settings.MEDIA_ROOT)
     if not filename.startswith(media_root):
         filename = os.path.join(media_root, filename)
     try:
         mtime = os.path.getmtime(filename)
         return get_hexdigest(str(int(mtime)))[:12]
     except OSError:
         return None
-