From 80a1d2fc90cf9109581c8dadb13c686438bf68f6 Mon Sep 17 00:00:00 2001 From: Philip Garnero Date: Fri, 3 Jul 2015 18:38:29 +0200 Subject: better check on file path to allow dots in filenames fixes issue #334 --- scss/extension/core.py | 10 +++++----- scss/tests/files/regressions/include/_issue-334.scss | 3 +++ scss/tests/files/regressions/include/_issue.334.scss | 3 +++ scss/tests/files/regressions/issue-334-a.css | 3 +++ scss/tests/files/regressions/issue-334-a.scss | 1 + scss/tests/files/regressions/issue-334-b.css | 3 +++ scss/tests/files/regressions/issue-334-b.scss | 1 + scss/tests/files/regressions/issue-334-c.css | 3 +++ scss/tests/files/regressions/issue-334-c.scss | 1 + scss/tests/files/regressions/issue-334-d.css | 3 +++ scss/tests/files/regressions/issue-334-d.scss | 1 + scss/tests/files/regressions/issue-334-e.css | 3 +++ scss/tests/files/regressions/issue-334-e.scss | 1 + scss/tests/files/regressions/issue-334-f.css | 3 +++ scss/tests/files/regressions/issue-334-f.scss | 1 + scss/tests/files/regressions/issue-334-g.css | 3 +++ scss/tests/files/regressions/issue-334-g.scss | 1 + scss/tests/files/regressions/issue-334-h.css | 3 +++ scss/tests/files/regressions/issue-334-h.scss | 1 + 19 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 scss/tests/files/regressions/include/_issue-334.scss create mode 100644 scss/tests/files/regressions/include/_issue.334.scss create mode 100644 scss/tests/files/regressions/issue-334-a.css create mode 100644 scss/tests/files/regressions/issue-334-a.scss create mode 100644 scss/tests/files/regressions/issue-334-b.css create mode 100644 scss/tests/files/regressions/issue-334-b.scss create mode 100644 scss/tests/files/regressions/issue-334-c.css create mode 100644 scss/tests/files/regressions/issue-334-c.scss create mode 100644 scss/tests/files/regressions/issue-334-d.css create mode 100644 scss/tests/files/regressions/issue-334-d.scss create mode 100644 scss/tests/files/regressions/issue-334-e.css create mode 100644 scss/tests/files/regressions/issue-334-e.scss create mode 100644 scss/tests/files/regressions/issue-334-f.css create mode 100644 scss/tests/files/regressions/issue-334-f.scss create mode 100644 scss/tests/files/regressions/issue-334-g.css create mode 100644 scss/tests/files/regressions/issue-334-g.scss create mode 100644 scss/tests/files/regressions/issue-334-h.css create mode 100644 scss/tests/files/regressions/issue-334-h.scss diff --git a/scss/extension/core.py b/scss/extension/core.py index 6642f1d..2fd5d4d 100644 --- a/scss/extension/core.py +++ b/scss/extension/core.py @@ -34,12 +34,12 @@ class CoreExtension(Extension): # import relative to the current file even if the current file isn't # anywhere in the search path. is that right? path = PurePosixPath(name) - if path.suffix: - search_exts = [path.suffix] - else: - search_exts = compilation.compiler.dynamic_extensions - basename = path.stem + search_exts = list(compilation.compiler.dynamic_extensions) + if path.suffix and path.suffix in search_exts: + basename = path.stem + else: + basename = path.name relative_to = path.parent search_path = [] # tuple of (origin, start_from) if relative_to.is_absolute(): diff --git a/scss/tests/files/regressions/include/_issue-334.scss b/scss/tests/files/regressions/include/_issue-334.scss new file mode 100644 index 0000000..fb1123c --- /dev/null +++ b/scss/tests/files/regressions/include/_issue-334.scss @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/include/_issue.334.scss b/scss/tests/files/regressions/include/_issue.334.scss new file mode 100644 index 0000000..fb1123c --- /dev/null +++ b/scss/tests/files/regressions/include/_issue.334.scss @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-a.css b/scss/tests/files/regressions/issue-334-a.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-a.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-a.scss b/scss/tests/files/regressions/issue-334-a.scss new file mode 100644 index 0000000..f05dc54 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-a.scss @@ -0,0 +1 @@ +@import "issue-334"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-b.css b/scss/tests/files/regressions/issue-334-b.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-b.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-b.scss b/scss/tests/files/regressions/issue-334-b.scss new file mode 100644 index 0000000..12e9298 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-b.scss @@ -0,0 +1 @@ +@import "issue.334"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-c.css b/scss/tests/files/regressions/issue-334-c.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-c.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-c.scss b/scss/tests/files/regressions/issue-334-c.scss new file mode 100644 index 0000000..28e51b3 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-c.scss @@ -0,0 +1 @@ +@import "_issue-334"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-d.css b/scss/tests/files/regressions/issue-334-d.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-d.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-d.scss b/scss/tests/files/regressions/issue-334-d.scss new file mode 100644 index 0000000..f44c269 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-d.scss @@ -0,0 +1 @@ +@import "_issue.334"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-e.css b/scss/tests/files/regressions/issue-334-e.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-e.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-e.scss b/scss/tests/files/regressions/issue-334-e.scss new file mode 100644 index 0000000..e7bb33e --- /dev/null +++ b/scss/tests/files/regressions/issue-334-e.scss @@ -0,0 +1 @@ +@import "issue.334.scss"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-f.css b/scss/tests/files/regressions/issue-334-f.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-f.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-f.scss b/scss/tests/files/regressions/issue-334-f.scss new file mode 100644 index 0000000..3a3a476 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-f.scss @@ -0,0 +1 @@ +@import "issue-334.scss"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-g.css b/scss/tests/files/regressions/issue-334-g.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-g.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-g.scss b/scss/tests/files/regressions/issue-334-g.scss new file mode 100644 index 0000000..1f677b7 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-g.scss @@ -0,0 +1 @@ +@import "include/issue-334"; \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-h.css b/scss/tests/files/regressions/issue-334-h.css new file mode 100644 index 0000000..763d165 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-h.css @@ -0,0 +1,3 @@ +a { + color: white; +} \ No newline at end of file diff --git a/scss/tests/files/regressions/issue-334-h.scss b/scss/tests/files/regressions/issue-334-h.scss new file mode 100644 index 0000000..1f677b7 --- /dev/null +++ b/scss/tests/files/regressions/issue-334-h.scss @@ -0,0 +1 @@ +@import "include/issue-334"; \ No newline at end of file -- cgit v1.2.1