aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-12-11 15:26:09 -0500
committerGitHub <noreply@github.com>2019-12-11 15:26:09 -0500
commitb3b72cb9e3f83609082793362385345d91e0be37 (patch)
tree930c83ce9a9504c29c35a9976da98b184066d900 /python/servo/command_base.py
parente10cf7adad91a4740a5ba859f4fc33ee59423908 (diff)
parent0032b3cdd1cd9a275c48885b31ba9fd600358d1d (diff)
downloadservo-b3b72cb9e3f83609082793362385345d91e0be37.tar.gz
servo-b3b72cb9e3f83609082793362385345d91e0be37.zip
Auto merge of #25239 - marmeladema:issue-23607/test-tidy-no-wpt, r=jdm
Make `mach test-tidy --no-wpt` compatible with Python3 Make `mach test-tidy --no-wpt` compatible with Python3 See also #23607 After this pull request, all python files (except WPT) will be checked for Python3 syntax compatibility. --- <!-- 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: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 764afc9a15a..86121b38fb0 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -627,7 +627,7 @@ install them, let us know by filing a bug!")
def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False, uwp=False, features=None):
"""Return an extended environment dictionary."""
env = os.environ.copy()
- if sys.platform == "win32" and type(env['PATH']) == unicode:
+ if sys.platform == "win32" and type(env['PATH']) == six.text_type:
# On win32, the virtualenv's activate_this.py script sometimes ends up
# turning os.environ['PATH'] into a unicode string. This doesn't work
# for passing env vars in to a process, so we force it back to ascii.