| Alphare |
| hg-reviewers |
PYTHON3 is always True. So this flow can be reduced.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/run-tests.py (4 lines) |
| try: | try: | ||||
| os.remove(f) | os.remove(f) | ||||
| except OSError: | except OSError: | ||||
| pass | pass | ||||
| def _usecorrectpython(self): | def _usecorrectpython(self): | ||||
| """Configure the environment to use the appropriate Python in tests.""" | """Configure the environment to use the appropriate Python in tests.""" | ||||
| # Tests must use the same interpreter as us or bad things will happen. | # Tests must use the same interpreter as us or bad things will happen. | ||||
| if WINDOWS and PYTHON3: | if WINDOWS: | ||||
| pyexe_names = [b'python', b'python3', b'python.exe'] | pyexe_names = [b'python', b'python3', b'python.exe'] | ||||
| elif WINDOWS: | |||||
| pyexe_names = [b'python', b'python.exe'] | |||||
| else: | else: | ||||
| pyexe_names = [b'python', b'python3'] | pyexe_names = [b'python', b'python3'] | ||||
| # os.symlink() is a thing with py3 on Windows, but it requires | # os.symlink() is a thing with py3 on Windows, but it requires | ||||
| # Administrator rights. | # Administrator rights. | ||||
| if not WINDOWS and getattr(os, 'symlink', None): | if not WINDOWS and getattr(os, 'symlink', None): | ||||
| msg = "# Making python executable in test path a symlink to '%s'" | msg = "# Making python executable in test path a symlink to '%s'" | ||||
| msg %= sysexecutable | msg %= sysexecutable | ||||