diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-01 18:48:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 18:48:09 -0400 |
| commit | 3340214a292df5121ac81ea9a63c6b6a565a060b (patch) | |
| tree | 2dcc90f7433952eca34e1384a8b24d127a41c5e9 /components/script/dom/htmltimeelement.rs | |
| parent | e27653ceae291f7506b6ca1cfe266033bd35ecdc (diff) | |
| parent | c0052c089407128b9f2b777dedcd29b1e9ddac03 (diff) | |
| download | servo-3340214a292df5121ac81ea9a63c6b6a565a060b.tar.gz servo-3340214a292df5121ac81ea9a63c6b6a565a060b.zip | |
Auto merge of #23098 - TheGoddessInari:py2, r=jdm
Py2
<!-- Please describe your changes on the following line: -->
da3102338c: Rework mach.bat to support VS2019 and user-supplied environments.
4551f6031f: Default mach.bat to using py -2.
03e47081fe: Don't assume the user's environment in mach_bootstrap.
---
<!-- 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
- [X] These changes fix #23083 (GitHub issue number if applicable)
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because it changes the python bootstrap slightly and the changes are obvious.
<!-- 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. -->
The virtualenv changes shouldn't disrupt anything as it just uses the existing python (being used) to call itself `-m virtualenv`, and only if it exists. imp is still apparently the preferred builtin way to find this in Python 2.x without actually importing it. Importing it would cause an unused import warning in tidy. It still picks up the new things in _virtualenv, just no longer has a special case for Win32/MSYS because it's no longer needed.
The .bat change is the simplest I could think of that allows fallback in both cases and is no worse than before. `where /Q` is documented by Microsoft to return 0 if a successful match is found, and print nothing in either case.
<!-- 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/23098)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmltimeelement.rs')
0 files changed, 0 insertions, 0 deletions