Merge pull request #343 from PhilipGarnero/allow-dots-in-filenames

better check on file path to allow dots in filenames
Kronuz · Jun 9, 2016 · 73ecaf0 · 73ecaf0
2 parents 74ff779 + 80a1d2f
commit 73ecaf0
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 5 deletions.
diff --git a/scss/extension/core.py b/scss/extension/core.py
@@ -34,12 +34,12 @@ def handle_import(self, name, compilation, rule):
         # 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
@@ -0,0 +1,3 @@
+a {
+    color: white;
+}
diff --git a/scss/tests/files/regressions/include/_issue.334.scss b/scss/tests/files/regressions/include/_issue.334.scss
@@ -0,0 +1,3 @@
+a {
+    color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-a.css b/scss/tests/files/regressions/issue-334-a.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-a.scss b/scss/tests/files/regressions/issue-334-a.scss
@@ -0,0 +1 @@
+@import "issue-334";
diff --git a/scss/tests/files/regressions/issue-334-b.css b/scss/tests/files/regressions/issue-334-b.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-b.scss b/scss/tests/files/regressions/issue-334-b.scss
@@ -0,0 +1 @@
+@import "issue.334";
diff --git a/scss/tests/files/regressions/issue-334-c.css b/scss/tests/files/regressions/issue-334-c.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-c.scss b/scss/tests/files/regressions/issue-334-c.scss
@@ -0,0 +1 @@
+@import "_issue-334";
diff --git a/scss/tests/files/regressions/issue-334-d.css b/scss/tests/files/regressions/issue-334-d.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-d.scss b/scss/tests/files/regressions/issue-334-d.scss
@@ -0,0 +1 @@
+@import "_issue.334";
diff --git a/scss/tests/files/regressions/issue-334-e.css b/scss/tests/files/regressions/issue-334-e.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-e.scss b/scss/tests/files/regressions/issue-334-e.scss
@@ -0,0 +1 @@
+@import "issue.334.scss";
diff --git a/scss/tests/files/regressions/issue-334-f.css b/scss/tests/files/regressions/issue-334-f.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-f.scss b/scss/tests/files/regressions/issue-334-f.scss
@@ -0,0 +1 @@
+@import "issue-334.scss";
diff --git a/scss/tests/files/regressions/issue-334-g.css b/scss/tests/files/regressions/issue-334-g.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-g.scss b/scss/tests/files/regressions/issue-334-g.scss
@@ -0,0 +1 @@
+@import "include/issue-334";
diff --git a/scss/tests/files/regressions/issue-334-h.css b/scss/tests/files/regressions/issue-334-h.css
@@ -0,0 +1,3 @@
+a {
+  color: white;
+}
diff --git a/scss/tests/files/regressions/issue-334-h.scss b/scss/tests/files/regressions/issue-334-h.scss
@@ -0,0 +1 @@
+@import "include/issue-334";