summaryrefslogtreecommitdiffstats
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2012-10-05 03:21:42 (GMT)
committerJesus Cea <jcea@jcea.es>2012-10-05 03:21:42 (GMT)
commit685fffa8f427b3a768b232170752565d58c32112 (patch)
tree0ed6832fb0417dd52677dc5ad12a6718ed6adc5a /Lib/platform.py
parentadc8211e0084126c1d3190022929c3bffef12ce6 (diff)
downloadcpython-685fffa8f427b3a768b232170752565d58c32112.zip
cpython-685fffa8f427b3a768b232170752565d58c32112.tar.gz
cpython-685fffa8f427b3a768b232170752565d58c32112.tar.bz2
#16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index f2dd520..eedc11c 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -997,8 +997,8 @@ def _syscmd_file(target,default=''):
return default
target = _follow_symlinks(target)
try:
- 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.communicate()[0].decode("latin-1")