Auto merge of #13171 - emilio:mako-is-back, r=SimonSapin

Revert "Remove mako.zip"

<!-- Please describe your changes on the following line: -->

Stylo doesn't use Servo's virtualenv, so we need to integrate it into Gecko's build before doing this.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

This reverts commit 95e3f8333a.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13171)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-03 23:56:55 -05:00 committed by GitHub
commit fe9d9096ec
3 changed files with 1 additions and 1 deletions

Binary file not shown.

View file

@ -7,6 +7,7 @@ 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

View file

@ -10,7 +10,6 @@ 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