Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Minor edits to new findstatic functionality; refs #19879.

Hopefully fixes a test failure on Jenkins.
  • Loading branch information...
commit 29345390b81a3bfce22af43617cabd0d08de3632 1 parent e2f2857
@timgraham timgraham authored
View
37 docs/ref/contrib/staticfiles.txt
@@ -163,7 +163,7 @@ output and just get the path names::
/home/polls.com/core/static/css/base.css
On the other hand, by setting the :djadminopt:`--verbosity` flag to 2, you can
-get all the directories on which it searched the relative paths::
+get all the directories which were searched::
$ python manage.py findstatic css/base.css --verbosity 2
Found 'css/base.css' here:
@@ -176,8 +176,7 @@ get all the directories on which it searched the relative paths::
.. versionadded:: 1.7
- The additional message of on which directories it searched the relative
- paths is new in Django 1.7.
+ The additional output of which directories were searched was added.
.. _staticfiles-runserver:
@@ -360,6 +359,21 @@ slightly different call:
{% static "images/hi.jpg" as myphoto %}
<img src="{{ myphoto }}" alt="Hi!" />
+Finders Module
+==============
+
+``staticfiles`` finders has a ``searched_locations`` attribute which is a list
+of directory paths in which the finders searched. Example usage::
+
+ from django.contrib.staticfiles import finders
+
+ result = finders.find('css/base.css')
+ searched_locations = finders.searched_locations
+
+.. versionadded:: 1.7
+
+The ``searched_locations`` attribute was added.
+
Other Helpers
=============
@@ -383,23 +397,6 @@ files:
.. _staticfiles-development-view:
-Finders Module
-==============
-
-``staticfiles`` finders has a ``searched_locations`` list with directory paths
-in which they search for the relative paths. Example usage::
-
- from django.contrib.staticfiles import finders
-
- result = finders.find('css/base.css')
- searched_locations = finders.searched_locations
-
-.. versionadded:: 1.7
-
-The ``get_searched_locations`` function is new in Django 1.7. Previously, we
-have to check the locations of our :setting:`STATICFILES_FINDERS` manually
-one by one.
-
Static file development view
----------------------------
View
8 docs/releases/1.7.txt
@@ -390,6 +390,10 @@ Minor features
See the :class:`~django.contrib.staticfiles.storage.ManifestStaticFilesStorage`
docs for more information.
+* :djadmin:`findstatic` now accepts verbosity flag level 2, meaning it will
+ show the relative paths of the directories it searched. See
+ :djadmin:`findstatic` for example output.
+
:mod:`django.contrib.syndication`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1051,10 +1055,6 @@ Miscellaneous
which does allow primary keys with value 0. It only forbids *autoincrement*
primary keys with value 0.
-* :djadmin:`findstatic` now accepts verbosity flag level 2, meaning it will
- show the directories on which it searched the relative paths. See
- :djadmin:`findstatic` for example output.
-
.. _deprecated-features-1.7:
Features deprecated in 1.7
View
8 tests/staticfiles_tests/tests.py
@@ -236,19 +236,19 @@ def test_all_files_more_verbose(self):
self.assertIn('apps', force_text(lines[2]))
self.assertIn("Looking in the following locations:", force_text(lines[3]))
searched_locations = ', '.join(lines[4:])
- #AppDirectoriesFinder searched locations
+ # AppDirectoriesFinder searched locations
self.assertIn(os.path.join('staticfiles_tests', 'apps', 'test', 'static'),
searched_locations)
self.assertIn(os.path.join('staticfiles_tests', 'apps', 'no_label', 'static'),
searched_locations)
self.assertIn(os.path.join('django', 'contrib', 'admin', 'static'),
searched_locations)
- self.assertIn(os.path.join('django', 'tests', 'servers', 'another_app', 'static'),
+ self.assertIn(os.path.join('tests', 'servers', 'another_app', 'static'),
searched_locations)
- #FileSystemFinder searched locations
+ # FileSystemFinder searched locations
self.assertIn(TEST_SETTINGS['STATICFILES_DIRS'][1][1], searched_locations)
self.assertIn(TEST_SETTINGS['STATICFILES_DIRS'][0], searched_locations)
- #DefaultStorageFinder searched locations
+ # DefaultStorageFinder searched locations
self.assertIn(os.path.join('staticfiles_tests', 'project', 'site_media', 'media'),
searched_locations)

1 comment on commit 2934539

@jezdez
Owner

Thanks @timgraham for cleaning up after me :)

Please sign in to comment.
Something went wrong with that request. Please try again.