support cloud completely

compressor/base.py

@@ -1,6 +1,5 @@
 from __future__ import with_statement, unicode_literals
 import os
-import codecs
 from importlib import import_module
 
 import six
@@ -15,7 +14,7 @@
 from compressor.exceptions import (CompressorError, UncompressableFileError,
         FilterDoesNotExist)
 from compressor.filters import CachedCompilerFilter
-from compressor.storage import compressor_file_storage
+from compressor.storage import compressor_file_storage, default_storage
 from compressor.signals import post_compress
 from compressor.utils import get_class, get_mod_func, staticfiles
 
@@ -168,9 +167,9 @@ def get_filecontent(self, filename, charset):
         if charset == 'utf-8':
             # Removes BOM
             charset = 'utf-8-sig'
-        with codecs.open(filename, 'r', charset) as fd:
+        with default_storage.open(filename) as fd:
             try:
-                return fd.read()
+                return fd.read().decode(charset)
             except IOError as e:
                 raise UncompressableFileError("IOError while processing "
                                               "'%s': %s" % (filename, e))

compressor/cache.py

@@ -109,10 +109,10 @@ def get_mtime(filename):
         key = get_mtime_cachekey(filename)
         mtime = cache.get(key)
         if mtime is None:
-            mtime = os.path.getmtime(filename)
+            mtime = default_storage.get_modified_time(filename).timestamp()
             cache.set(key, mtime, settings.COMPRESS_MTIME_DELAY)
         return mtime
-    return os.path.getmtime(filename)
+    return default_storage.get_modified_time(filename).timestamp()
 
 
 def get_hashed_mtime(filename, length=12):