Revert r80166 (and r80171), restore Lib/platform.py. subprocess cannot be used in platform.py
diff --git a/Lib/platform.py b/Lib/platform.py
index b213a92..79695ba 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -113,7 +113,7 @@
__version__ = '1.0.7'
-import sys, string, os, re
+import sys,string,os,re
### Globals & Constants
@@ -966,20 +966,13 @@
if sys.platform in ('dos','win32','win16','os2'):
# XXX Others too ?
return default
- import subprocess
- target = _follow_symlinks(target)
+ target = _follow_symlinks(target).replace('"', '\\"')
try:
- proc = subprocess.Popen(
- ['file', target],
- stdout=subprocess.PIPE,
- stderr=open(DEV_NULL, 'wb'))
+ f = os.popen('file "%s" 2> %s' % (target, DEV_NULL))
except (AttributeError,os.error):
return default
- stdout, stderr = proc.communicate()
- stdout = stdout.rstrip(b'\n\r')
- # get output from "filename: output"
- output = stdout.split(b': ', 1)[-1]
- rc = proc.wait()
+ output = string.strip(f.read())
+ rc = f.close()
if not output or rc:
return default
else:
@@ -995,6 +988,8 @@
'dos': ('','MSDOS'),
}
+_architecture_split = re.compile(r'[\s,]').split
+
def architecture(executable=sys.executable,bits='',linkage=''):
""" Queries the given executable (defaults to the Python interpreter
@@ -1029,11 +1024,11 @@
# Get data from the 'file' system command
if executable:
- fileout = _syscmd_file(executable, '')
+ output = _syscmd_file(executable, '')
else:
- fileout = ''
+ output = ''
- if not fileout and \
+ if not output and \
executable == sys.executable:
# "file" command did not return anything; we'll try to provide
# some sensible defaults then...
@@ -1045,6 +1040,9 @@
linkage = l
return bits, linkage
+ # Split the output into a list of strings omitting the filename
+ fileout = _architecture_split(output)[1:]
+
if 'executable' not in fileout:
# Format not supported
return bits,linkage