Merge pull request #74 from w3c/revert-localpaths

Go back to importing localpaths at lint's top level.
web-platform-tests · Jun 8, 2016 · 2264642 · 2264642
2 parents 5e3525d + 2ee850e
commit 2264642
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,5 @@ install:
   - pip install ./html5lib
   - pip install pytest-travis-fold
 script:
-  - py.test lint manifest
+  - py.test manifest
   - flake8
diff --git a/lint/lint.py b/lint/lint.py
@@ -9,6 +9,9 @@
 
 from collections import defaultdict
 
+from .. import localpaths
+
+from manifest.sourcefile import SourceFile
 from six import iteritems
 from six.moves import range
 
@@ -153,8 +156,6 @@ def check_regexp_line(repo_root, path, f):
     return errors
 
 def check_parsed(repo_root, path, f):
-    from manifest.sourcefile import SourceFile
-
     source_file = SourceFile(repo_root, path, "/")
 
     errors = []
@@ -251,7 +252,6 @@ def parse_args():
     return parser.parse_args()
 
 def main():
-    from .. import localpaths
     repo_root = localpaths.repo_root
     args = parse_args()
     paths = args.paths if args.paths else all_git_paths(repo_root)