django 1.2 compatibility

Signed-off-by: Timothée Peignier <timothee.peignier@tryphon.org>

pipeline/finders.py

-from django.contrib.staticfiles.finders import BaseStorageFinder
+try:
+	from django.contrib.staticfiles.finders import BaseStorageFinder
+except ImportError:
+	from staticfiles.finders import BaseStorageFinder
 
 from pipeline.storage import PipelineStorage
 

pipeline/signals.py

 import os
 
 from django.core.cache import cache
-from django.dispatch import Signal, receiver
+from django.dispatch import Signal
 
 from pipeline.conf import settings
 
@@ -10,9 +10,10 @@ css_compressed = Signal(providing_args=["package", "version"])
 js_compressed = Signal(providing_args=["package", "version"])
 
 
-@receiver(css_compressed)
-@receiver(js_compressed)
 def invalidate_cache(sender, package, version, **kwargs):
     filename_base, filename = os.path.split(package['output'])
     cache.set("pipeline:%s" % filename, str(version),
             settings.PIPELINE_CACHE_TIMEOUT)
+
+js_compressed.connect(invalidate_cache)
+css_compressed.connect(invalidate_cache)

pipeline/storage.py

@@ -3,7 +3,11 @@ import os
 
 from datetime import datetime
 
-from django.contrib.staticfiles import finders
+try:
+    from django.contrib.staticfiles import finders
+except ImportError:
+    from staticfiles import finders
+
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files.storage import FileSystemStorage, get_storage_class
 from django.utils.functional import LazyObject

tests/tests/compressor.py

@@ -5,7 +5,10 @@ import sys
 from mock import patch
 
 from django.test import TestCase
-from django.utils import unittest
+try:
+    from django.utils import unittest
+except ImportError:
+    import unittest2 as unittest
 
 from pipeline.conf import settings
 from pipeline.compressors import Compressor
@@ -116,11 +119,10 @@ class CompressorTest(TestCase):
         self.assertEquals(asset_path, "/images/sprite.png")
 
     def test_url_rewrite(self):
-        self.maxDiff = None
         output = self.compressor.concatenate_and_rewrite([
             'css/urls.css',
         ])
-        self.assertMultiLineEqual("""@font-face {
+        self.assertEquals("""@font-face {
   font-family: 'Pipeline';
   src: url(http://localhost/static/fonts/pipeline.eot);
   src: url(http://localhost/static/fonts/pipeline.eot?#iefix) format('embedded-opentype');

tox.ini

@@ -10,6 +10,8 @@ commands =
 deps =
     Django==1.3.1
     mock>=0.7.2
+    django-staticfiles
+    unittest2
 
 [testenv:docs]
 changedir = docs