traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MERGE: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch

This commit is contained in:
Jesus Cea 2012-10-05 05:31:31 +02:00
parent e7f90375b1 685fffa8f4
commit cb95996fdc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/platform.py
View File

@ -924,13 +924,12 @@ def _syscmd_file(target,default=''):
return default
target = _follow_symlinks(target)
try:
with open(DEV_NULL) as dev_null:
proc = subprocess.Popen(['file', '-b', '--', target],
stdout=subprocess.PIPE, stderr=dev_null)
proc = subprocess.Popen(['file', target],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
except (AttributeError,os.error):
return default
output = proc.stdout.read()
output = proc.communicate()[0].decode('latin-1')
rc = proc.wait()
if not output or rc:
return default