Bug 1651041 [wpt PR 24484] - Move six import after path is set, a=testonly
authorjgraham <james@hoppipolla.co.uk>
Thu, 09 Jul 2020 14:15:46 +0000
changeset 539810 4edbc1e8e64676dedc7d3e94f5ef280a873e66a0
parent 539809 bd47849c5a9582a3e3300c7b8e634daf620db85b
child 539811 939665c53acbd87f85ddf8c994f7bc46107112cf
push id37586
push userccoroiu@mozilla.com
push dateFri, 10 Jul 2020 16:06:24 +0000
treeherdermozilla-central@4e9d6619c9d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1651041, 24484
milestone80.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1651041 [wpt PR 24484] - Move six import after path is set, a=testonly Automatic update from web-platform-tests Move six import after path is set (#24484) Co-authored-by: Stephen McGruer <smcgruer@chromium.org> -- wpt-commits: 47821bc96914cfb6a42832490c987e16408e58be wpt-pr: 24484
testing/web-platform/tests/tools/localpaths.py
--- a/testing/web-platform/tests/tools/localpaths.py
+++ b/testing/web-platform/tests/tools/localpaths.py
@@ -1,11 +1,10 @@
 import os
 import sys
-from six import ensure_text
 
 here = os.path.abspath(os.path.split(__file__)[0])
 
 sys.path.insert(0, os.path.join(here))
 sys.path.insert(0, os.path.join(here, "wptserve"))
 sys.path.insert(0, os.path.join(here, "third_party", "pywebsocket3"))
 sys.path.insert(0, os.path.join(here, "third_party", "atomicwrites"))
 sys.path.insert(0, os.path.join(here, "third_party", "attrs", "src"))
@@ -23,9 +22,11 @@ sys.path.insert(0, os.path.join(here, "t
 sys.path.insert(0, os.path.join(here, "third_party", "certifi"))
 sys.path.insert(0, os.path.join(here, "third_party", "hyper"))
 sys.path.insert(0, os.path.join(here, "webdriver"))
 sys.path.insert(0, os.path.join(here, "wptrunner"))
 
 if sys.version_info[0] == 2:
     sys.path.insert(0, os.path.join(here, "third_party", "enum"))
 
+# We can't import six until we've set the path above.
+from six import ensure_text
 repo_root = ensure_text(os.path.abspath(os.path.join(here, os.pardir)))