Merge pull request #5 from jschneier/django_17_migrations

add deconstructible decorator to S3BotoStorage

storages/backends/s3boto.py

@@ -21,7 +21,7 @@
                                "See https://github.com/boto/boto")
 
 from storages.utils import setting
-from storages.compat import urlparse, BytesIO
+from storages.compat import urlparse, BytesIO, deconstructible
 
 boto_version_info = tuple([int(i) for i in boto_version.split('-')[0].split('.')])
 
@@ -73,6 +73,7 @@ def safe_join(base, *paths):
     return final_path.lstrip('/')
 
 
+@deconstructible
 class S3BotoStorageFile(File):
     """
     The default file object used by the S3BotoStorage backend.

storages/compat.py

@@ -1,2 +1,7 @@
 from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.six import BytesIO
+
+try:
+    from django.utils.deconstruct import deconstructible
+except ImportError: # Django 1.7+ migrations
+    deconstructible = lambda klass, *args, **kwargs : klass