Merge branch 'release/1.0'

README.rst

@@ -14,18 +14,24 @@ somewhere your web server can find it. However, in bigger projects -- especially
 those comprised of multiple apps -- dealing with the multiple sets of static
 files provided by each application starts to get tricky.
 
-That's what ``staticfiles`` is for: it collects media from each of your
+That's what ``staticfiles`` is for: it collects static files from each of your
 applications (and any other places you specify) into a single location
 that can easily be served in production.
 
 The main website for django-staticfiles is
 `github.com/jezdez/django-staticfiles`_ where you can also file tickets.
 
 .. warning:: django-staticfiles was added to Django 1.3 as a contrib app.
-   For backwards compatible reasons, django-staticfiles 0.3.X series will be
-   the last series to only support Django 1.2.X and lower. Any new features
-   (including those backported from Django) will occur in later releases,
-   e.g. in django-staticfiles>=1.0.X.
+
+   The django-staticfiles 0.3.X series will only receive security and data los
+   bug fixes after the release of django-staticfiles 1.0. Any Django 1.2.X
+   project using django-staticfiles 0.3.X and lower should be upgraded to use
+   either Django's staticfiles app or django-staticfiles>=1.0 to profit from
+   the feature parity.
+
+   Since any new feature (including those backported from Django's staticfiles
+   app) will be added in releases >= 1.0.X of this app, you may want to chose
+   to use it instead of Django's own staticfiles app.
 
 Installation
 ------------

docs/conf.py

@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0rc2'
+release = '1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

staticfiles/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 0, 0, "rc", 2)  # following PEP 386
+VERSION = (1, 0, 0, "f", 0)  # following PEP 386
 DEV_N = None
 
 

staticfiles/management/commands/collectstatic.py

@@ -116,14 +116,14 @@ def delete_file(self, path, prefixed_path, source_storage, **options):
             try:
                 # When was the target file modified last time?
                 target_last_modified = self.storage.modified_time(prefixed_path)
-            except (OSError, NotImplementedError):
+            except (OSError, NotImplementedError, AttributeError):
                 # The storage doesn't support ``modified_time`` or failed
                 pass
             else:
                 try:
                     # When was the source file modified last time?
                     source_last_modified = source_storage.modified_time(path)
-                except (OSError, NotImplementedError):
+                except (OSError, NotImplementedError, AttributeError):
                     pass
                 else:
                     # The full path of the target file