Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17857 -- Stopped CachedStaticFilesStorage from creating absolu…

…te URLs unnecessarily. Thanks, tgecho.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0ee801e3603218a3c3a8c0adbc94f69e40523ee2 1 parent 7487c74
Jannis Leidel jezdez authored
6 django/contrib/staticfiles/storage.py
View
@@ -165,9 +165,11 @@ def converter(matchobj):
start, end = 1, sub_level - 1
joined_result = '/'.join(name_parts[:-start] + url_parts[end:])
hashed_url = self.url(unquote(joined_result), force=True)
+ file_name = hashed_url.split('/')[-1:]
+ relative_url = '/'.join(url.split('/')[:-1] + file_name)
- # Return the hashed and normalized version to the file
- return 'url("%s")' % unquote(hashed_url)
+ # Return the hashed version to the file
+ return 'url("%s")' % unquote(relative_url)
return converter
def post_process(self, paths, dry_run=False, **options):
2  docs/ref/contrib/staticfiles.txt
View
@@ -327,7 +327,7 @@ CachedStaticFilesStorage
.. code-block:: css+django
- @import url("/static/admin/css/base.27e20196a850.css");
+ @import url("../admin/css/base.27e20196a850.css");
To enable the ``CachedStaticFilesStorage`` you have to make sure the
following requirements are met:
21 tests/regressiontests/staticfiles_tests/tests.py
View
@@ -385,7 +385,7 @@ def test_template_tag_simple_content(self):
with storage.staticfiles_storage.open(relpath) as relfile:
content = relfile.read()
self.assertNotIn("cached/other.css", content)
- self.assertIn("/static/cached/other.d41d8cd98f00.css", content)
+ self.assertIn("other.d41d8cd98f00.css", content)
def test_path_with_querystring(self):
relpath = self.cached_file_path("cached/styles.css?spam=eggs")
@@ -395,7 +395,7 @@ def test_path_with_querystring(self):
"cached/styles.93b1147e8552.css") as relfile:
content = relfile.read()
self.assertNotIn("cached/other.css", content)
- self.assertIn("/static/cached/other.d41d8cd98f00.css", content)
+ self.assertIn("other.d41d8cd98f00.css", content)
def test_path_with_fragment(self):
relpath = self.cached_file_path("cached/styles.css#eggs")
@@ -404,15 +404,15 @@ def test_path_with_fragment(self):
"cached/styles.93b1147e8552.css") as relfile:
content = relfile.read()
self.assertNotIn("cached/other.css", content)
- self.assertIn("/static/cached/other.d41d8cd98f00.css", content)
+ self.assertIn("other.d41d8cd98f00.css", content)
def test_path_with_querystring_and_fragment(self):
relpath = self.cached_file_path("cached/css/fragments.css")
self.assertEqual(relpath, "cached/css/fragments.75433540b096.css")
with storage.staticfiles_storage.open(relpath) as relfile:
content = relfile.read()
- self.assertIn('/static/cached/css/fonts/font.a4b0478549d0.eot?#iefix', content)
- self.assertIn('/static/cached/css/fonts/font.b8d603e42714.svg#webfontIyfZbseF', content)
+ self.assertIn('fonts/font.a4b0478549d0.eot?#iefix', content)
+ self.assertIn('fonts/font.b8d603e42714.svg#webfontIyfZbseF', content)
self.assertIn('data:font/woff;charset=utf-8;base64,d09GRgABAAAAADJoAA0AAAAAR2QAAQAAAAAAAAAAAAA', content)
self.assertIn('#default#VML', content)
@@ -431,21 +431,20 @@ def test_template_tag_denorm(self):
with storage.staticfiles_storage.open(relpath) as relfile:
content = relfile.read()
self.assertNotIn("..//cached///styles.css", content)
- self.assertIn("/static/cached/styles.93b1147e8552.css", content)
+ self.assertIn("../cached/styles.93b1147e8552.css", content)
self.assertNotIn("url(img/relative.png )", content)
- self.assertIn("/static/cached/img/relative.acae32e4532b.png", content)
+ self.assertIn('url("img/relative.acae32e4532b.png', content)
def test_template_tag_relative(self):
relpath = self.cached_file_path("cached/relative.css")
self.assertEqual(relpath, "cached/relative.2217ea7273c2.css")
with storage.staticfiles_storage.open(relpath) as relfile:
content = relfile.read()
- self.assertIn("/static/cached/styles.93b1147e8552.css", content)
self.assertNotIn("../cached/styles.css", content)
self.assertNotIn('@import "styles.css"', content)
self.assertNotIn('url(img/relative.png)', content)
- self.assertIn('url("/static/cached/img/relative.acae32e4532b.png")', content)
- self.assertIn("/static/cached/styles.93b1147e8552.css", content)
+ self.assertIn('url("img/relative.acae32e4532b.png")', content)
+ self.assertIn("../cached/styles.93b1147e8552.css", content)
def test_template_tag_deep_relative(self):
relpath = self.cached_file_path("cached/css/window.css")
@@ -453,7 +452,7 @@ def test_template_tag_deep_relative(self):
with storage.staticfiles_storage.open(relpath) as relfile:
content = relfile.read()
self.assertNotIn('url(img/window.png)', content)
- self.assertIn('url("/static/cached/css/img/window.acae32e4532b.png")', content)
+ self.assertIn('url("img/window.acae32e4532b.png")', content)
def test_template_tag_url(self):
relpath = self.cached_file_path("cached/url.css")
Please sign in to comment.
Something went wrong with that request. Please try again.