mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Jesus Cea 2012-10-05 05:32:10 +02:00
commit b451fd65de
1 changed files with 3 additions and 4 deletions
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 return default
target = _follow_symlinks(target) target = _follow_symlinks(target)
try: try:
with open(DEV_NULL) as dev_null: proc = subprocess.Popen(['file', target],
proc = subprocess.Popen(['file', '-b', '--', target], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout=subprocess.PIPE, stderr=dev_null)
except (AttributeError,os.error): except (AttributeError,os.error):
return default return default
output = proc.stdout.read() output = proc.communicate()[0].decode('latin-1')
rc = proc.wait() rc = proc.wait()
if not output or rc: if not output or rc:
return default return default