Commit b0457837 authored by Karen Tracey's avatar Karen Tracey
Browse files

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
parent 5df784ab

django/contrib/staticfiles/storage.py

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ class CachedFilesMixin(object): 
            cache_key = self.cache_key(name)

            hashed_name = self.cache.get(cache_key)

            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)

                self.cache.set(cache_key, hashed_name)

        return unquote(super(CachedFilesMixin, self).url(hashed_name))
@@ -121,7 +121,7 @@ class CachedFilesMixin(object): 
            # Completely ignore http(s) prefixed URLs

            if url.startswith(('http', 'https')):

                return matched

            name_parts = name.split('/')

            name_parts = name.split(os.sep)

            # Using posix normpath here to remove duplicates

            url = posixpath.normpath(url)

            url_parts = url.split('/')