summaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorPhilip Garnero <philip.garnero@corp.ovh.com>2015-07-03 18:38:29 +0200
committerPhilip Garnero <philip.garnero@corp.ovh.com>2015-07-03 18:38:29 +0200
commit80a1d2fc90cf9109581c8dadb13c686438bf68f6 (patch)
tree0a8762d70aef26d33a3384a42fdd3b73decb235d /scss
parent67cfaea96f1fdcc54825fabae5b75dff4c4e4278 (diff)
downloadpyscss-80a1d2fc90cf9109581c8dadb13c686438bf68f6.tar.gz
better check on file path to allow dots in filenames
fixes issue #334
Diffstat (limited to 'scss')
-rw-r--r--scss/extension/core.py10
-rw-r--r--scss/tests/files/regressions/include/_issue-334.scss3
-rw-r--r--scss/tests/files/regressions/include/_issue.334.scss3
-rw-r--r--scss/tests/files/regressions/issue-334-a.css3
-rw-r--r--scss/tests/files/regressions/issue-334-a.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-b.css3
-rw-r--r--scss/tests/files/regressions/issue-334-b.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-c.css3
-rw-r--r--scss/tests/files/regressions/issue-334-c.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-d.css3
-rw-r--r--scss/tests/files/regressions/issue-334-d.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-e.css3
-rw-r--r--scss/tests/files/regressions/issue-334-e.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-f.css3
-rw-r--r--scss/tests/files/regressions/issue-334-f.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-g.css3
-rw-r--r--scss/tests/files/regressions/issue-334-g.scss1
-rw-r--r--scss/tests/files/regressions/issue-334-h.css3
-rw-r--r--scss/tests/files/regressions/issue-334-h.scss1
19 files changed, 43 insertions, 5 deletions
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