cpython: d6d908dc11f2 (original) (raw)
Mercurial > cpython
changeset 79451:d6d908dc11f2 2.7
Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Solve a 2.7 bootstrap issue [#16112]
| Jesus Cea jcea@jcea.es | |
|---|---|
| date | Thu, 04 Oct 2012 15:14:56 +0200 |
| parents | de5d5cbf1b45 |
| children | 06772ba3d001 |
| files | Lib/platform.py |
| diffstat | 1 files changed, 21 insertions(+), 1 deletions(-)[+] [-] Lib/platform.py 22 |
line wrap: on
line diff
--- a/Lib/platform.py +++ b/Lib/platform.py @@ -113,7 +113,7 @@ version = '1.0.7' -import sys,string,os,re,subprocess +import sys,string,os,re
Globals & Constants
@@ -1020,6 +1020,26 @@ def _syscmd_file(target,default=''): case the command should fail. """ +
We do the import here to avoid a bootstrap issue.
See c73b90b6dadd changeset.
- #
[..]
ranlib libpython2.7.a
gcc -o python [](#l1.22)
Modules/python.o [](#l1.23)
libpython2.7.a -lsocket -lnsl -ldl -lm
Traceback (most recent call last):
File "./setup.py", line 8, in
from platform import machine as platform_machine
File "[..]/build/Lib/platform.py", line 116, in
import sys,string,os,re,subprocess
File "[..]/build/Lib/subprocess.py", line 429, in
import select
ImportError: No module named select
+ if sys.platform in ('dos','win32','win16','os2'): # XXX Others too ? return default