forked from mirrors/gecko-dev
7c5d675d77
Running `mach build` in servo directory in Firefox tree currently doesn't work due to several errors when importing modules.
First error:
```text
Traceback (most recent call last):
File "mach", line 93, in <module>
main(sys.argv)
File "mach", line 23, in main
mach = mach_bootstrap.bootstrap(topdir)
File "servo/python/mach_bootstrap.py", line 280, in bootstrap
mach.load_commands_from_file(os.path.join(topdir, path))
File "servo/python/_virtualenv/Lib/site-packages/mach/main.py", line 265, in load_commands_from_file
imp.load_source(module_name, path)
File "servo/python/servo/testing_commands.py", line 42, in <module>
from update import updatecommandline
File "servo/../testing/web-platform/update/__init__.py", line 17, in <module>
from wptrunner.update import setup_logging, WPTUpdate
File "servo/../testing/web-platform/tests/tools/wptrunner/wptrunner/update/__init__.py", line 8, in <module>
from update import WPTUpdate
File "servo/../testing/web-platform/tests/tools/wptrunner/wptrunner/update/update.py", line 8, in <module>
from .. import environment as env
File "servo/../testing/web-platform/tests/tools/wptrunner/wptrunner/environment.py", line 12, in <module>
from wptserve.handlers import StringHandler
ImportError: No module named wptserve.handlers
```
Second error:
```text
Traceback (most recent call last):
File "mach", line 93, in <module>
main(sys.argv)
File "mach", line 23, in main
mach = mach_bootstrap.bootstrap(topdir)
File "servo/python/mach_bootstrap.py", line 291, in bootstrap
mach.load_commands_from_file(os.path.join(topdir, path))
File "servo/python/_virtualenv/Lib/site-packages/mach/main.py", line 265, in load_commands_from_file
imp.load_source(module_name, path)
File "servo/python/servo/testing_commands.py", line 43, in <module>
from servo_tidy import tidy
File "servo/python/tidy/servo_tidy/tidy.py", line 34, in <module>
from wptmanifest import parser, node
ImportError: No module named wptmanifest
```
The two commits fix these two errors respectively.
Source-Repo: https://github.com/servo/servo
Source-Revision: 4e2f8ec8e162fe707240eff223ec225790bf29fd
--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : fd8d95aa6ee79b994cdf8a6ca6f948ac3ba725b3
|
||
|---|---|---|
| .. | ||
| __init__.py | ||
| licenseck.py | ||
| tidy.py | ||