innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #17462: Adjusted staticfiles CachedFilesMixin code so its tests pass on Windows. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2011-12-25 19:44:20 +00:00
parent 5df784ab42
commit b045783729
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/staticfiles/storage.py
View File

@ -102,7 +102,7 @@ class CachedFilesMixin(object):
cache_key = self.cache_key(name) cache_key = self.cache_key(name)
hashed_name = self.cache.get(cache_key) hashed_name = self.cache.get(cache_key)
if hashed_name is None: if hashed_name is None:
hashed_name = self.hashed_name(name) hashed_name = self.hashed_name(name).replace('\\', '/')
# set the cache if there was a miss (e.g. if cache server goes down) # set the cache if there was a miss (e.g. if cache server goes down)
self.cache.set(cache_key, hashed_name) self.cache.set(cache_key, hashed_name)
return unquote(super(CachedFilesMixin, self).url(hashed_name)) return unquote(super(CachedFilesMixin, self).url(hashed_name))
@ -121,7 +121,7 @@ class CachedFilesMixin(object):
# Completely ignore http(s) prefixed URLs # Completely ignore http(s) prefixed URLs
if url.startswith(('http', 'https')): if url.startswith(('http', 'https')):
return matched return matched
name_parts = name.split('/') name_parts = name.split(os.sep)
# Using posix normpath here to remove duplicates # Using posix normpath here to remove duplicates
url = posixpath.normpath(url) url = posixpath.normpath(url)
url_parts = url.split('/') url_parts = url.split('/')