diff --git a/compressor/filters/css_default.py b/compressor/filters/css_default.py index 6f2ffb9..93c19df 100644 --- a/compressor/filters/css_default.py +++ b/compressor/filters/css_default.py @@ -50,7 +50,7 @@ class CssAbsoluteFilter(FilterBase): if local_path.startswith(self.url_path): local_path = local_path.replace(self.url_path, "", 1) # Re-build the local full path by adding root - filename = os.path.join(self.root, local_path.lstrip(os.sep)) + filename = os.path.join(self.root, local_path.lstrip('/')) return os.path.exists(filename) and filename def add_suffix(self, url): diff --git a/tests/tests/base.py b/tests/tests/base.py index 7ec94f9..4dc5608 100644 --- a/tests/tests/base.py +++ b/tests/tests/base.py @@ -41,9 +41,9 @@ class CompressorTestCase(TestCase): def test_css_split(self): out = [ - (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css/one.css'), u'css/one.css', u''), + (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css', u'one.css'), u'css/one.css', u''), (SOURCE_HUNK, u'p { border:5px solid green;}', None, u''), - (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css/two.css'), u'css/two.css', u''), + (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css', u'two.css'), u'css/two.css', u''), ] split = self.css_node.split_contents() split = [(x[0], x[1], x[2], self.css_node.parser.elem_str(x[3])) for x in split] @@ -80,7 +80,7 @@ class CompressorTestCase(TestCase): def test_js_split(self): out = [ - (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'js/one.js'), u'js/one.js', ''), + (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'js', u'one.js'), u'js/one.js', ''), (SOURCE_HUNK, u'obj.value = "value";', None, ''), ] split = self.js_node.split_contents() diff --git a/tests/tests/parsers.py b/tests/tests/parsers.py index de6a0b3..3bf676a 100644 --- a/tests/tests/parsers.py +++ b/tests/tests/parsers.py @@ -45,9 +45,9 @@ class Html5LibParserTests(ParserTestCase, CompressorTestCase): def test_css_split(self): out = [ - (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css/one.css'), u'css/one.css', u''), + (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css', u'one.css'), u'css/one.css', u''), (SOURCE_HUNK, u'p { border:5px solid green;}', None, u''), - (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css/two.css'), u'css/two.css', u''), + (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'css', u'two.css'), u'css/two.css', u''), ] split = self.css_node.split_contents() split = [(x[0], x[1], x[2], self.css_node.parser.elem_str(x[3])) for x in split] @@ -55,7 +55,7 @@ class Html5LibParserTests(ParserTestCase, CompressorTestCase): def test_js_split(self): out = [ - (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'js/one.js'), u'js/one.js', u''), + (SOURCE_FILE, os.path.join(settings.COMPRESS_ROOT, u'js', u'one.js'), u'js/one.js', u''), (SOURCE_HUNK, u'obj.value = "value";', None, u''), ] split = self.js_node.split_contents()