Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file
diff --git a/Lib/platform.py b/Lib/platform.py
index 985a9f8..6776a25 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -111,7 +111,7 @@
__version__ = '1.0.7'
-import sys, os, re
+import sys, os, re, subprocess
### Globals & Constants
@@ -995,13 +995,15 @@
if sys.platform in ('dos','win32','win16','os2'):
# XXX Others too ?
return default
- target = _follow_symlinks(target).replace('"', '\\"')
+ target = _follow_symlinks(target)
try:
- f = os.popen('file -b "%s" 2> %s' % (target, DEV_NULL))
+ with open(DEV_NULL) as dev_null:
+ proc = subprocess.Popen(['file', '-b', '--', target],
+ stdout=subprocess.PIPE, stderr=dev_null)
except (AttributeError,os.error):
return default
- output = f.read().strip()
- rc = f.close()
+ output = proc.stdout.read()
+ rc = proc.wait()
if not output or rc:
return default
else: