| Alphare |
| hg-reviewers |
To fix the "python3 pointing to python2" we will also need to create a "python"
pointer. So we will need to create multiple pointer. So we need to stop using
early return.
We replace the early return with a loop and a continue, since the next
changeset will introduce that loop anyway.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| pyexename = b'python3' # XXX this is wrong with python2... | pyexename = b'python3' # XXX this is wrong with python2... | ||||
| # 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 getattr(os, 'symlink', None) and os.name != 'nt': | if getattr(os, 'symlink', None) and os.name != 'nt': | ||||
| 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 | ||||
| vlog(msg) | vlog(msg) | ||||
| for pyexename in [pyexename]: | |||||
| mypython = os.path.join(self._tmpbindir, pyexename) | mypython = os.path.join(self._tmpbindir, pyexename) | ||||
| try: | try: | ||||
| if os.readlink(mypython) == sysexecutable: | if os.readlink(mypython) == sysexecutable: | ||||
| return | continue | ||||
| os.unlink(mypython) | os.unlink(mypython) | ||||
| except OSError as err: | except OSError as err: | ||||
| if err.errno != errno.ENOENT: | if err.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| if self._findprogram(pyexename) != sysexecutable: | if self._findprogram(pyexename) != sysexecutable: | ||||
| try: | try: | ||||
| os.symlink(sysexecutable, mypython) | os.symlink(sysexecutable, mypython) | ||||
| self._createdfiles.append(mypython) | self._createdfiles.append(mypython) | ||||
| except OSError as err: | except OSError as err: | ||||
| # child processes may race, which is harmless | # child processes may race, which is harmless | ||||
| if err.errno != errno.EEXIST: | if err.errno != errno.EEXIST: | ||||
| raise | raise | ||||
| else: | else: | ||||
| # Windows doesn't have `python3.exe`, and MSYS cannot understand the | # Windows doesn't have `python3.exe`, and MSYS cannot understand the | ||||
| # reparse point with that name provided by Microsoft. Create a | # reparse point with that name provided by Microsoft. Create a | ||||
| # simple script on PATH with that name that delegates to the py3 | # simple script on PATH with that name that delegates to the py3 | ||||
| # launcher so the shebang lines work. | # launcher so the shebang lines work. | ||||
| if os.getenv('MSYSTEM'): | if os.getenv('MSYSTEM'): | ||||
| with open(osenvironb[b'RUNTESTDIR'] + b'/python3', 'wb') as f: | with open(osenvironb[b'RUNTESTDIR'] + b'/python3', 'wb') as f: | ||||
| f.write(b'#!/bin/sh\n') | f.write(b'#!/bin/sh\n') | ||||