aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/style/properties/Mako-0.9.1.zipbin469500 -> 0 bytes
-rw-r--r--components/style/properties/build.py1
-rw-r--r--python/requirements.txt1
-rw-r--r--tests/unit/style/properties/scaffolding.rs4
4 files changed, 5 insertions, 1 deletions
diff --git a/components/style/properties/Mako-0.9.1.zip b/components/style/properties/Mako-0.9.1.zip
deleted file mode 100644
index b7450e30012..00000000000
--- a/components/style/properties/Mako-0.9.1.zip
+++ /dev/null
Binary files differ
diff --git a/components/style/properties/build.py b/components/style/properties/build.py
index daa9140fd02..6f5550c7103 100644
--- a/components/style/properties/build.py
+++ b/components/style/properties/build.py
@@ -7,7 +7,6 @@ import os.path
import sys
BASE = os.path.dirname(__file__.replace('\\', '/'))
-sys.path.insert(0, os.path.join(BASE, "Mako-0.9.1.zip"))
sys.path.insert(0, BASE) # For importing `data.py`
from mako import exceptions
diff --git a/python/requirements.txt b/python/requirements.txt
index 97487c76aff..dd05d2f7694 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -10,6 +10,7 @@ toml == 0.9.1
flake8 == 2.4.1
pep8 == 1.5.7
pyflakes == 0.8.1
+mako == 0.9.1
# For test-webidl
ply == 3.8
diff --git a/tests/unit/style/properties/scaffolding.rs b/tests/unit/style/properties/scaffolding.rs
index f4fb064301a..b2225225201 100644
--- a/tests/unit/style/properties/scaffolding.rs
+++ b/tests/unit/style/properties/scaffolding.rs
@@ -32,6 +32,10 @@ fn properties_list_json() {
#[cfg(windows)]
fn find_python() -> String {
+ if Command::new("python2.7.exe").arg("--version").output().is_ok() {
+ return "python2.7.exe".to_owned();
+ }
+
if Command::new("python27.exe").arg("--version").output().is_ok() {
return "python27.exe".to_owned();
}