bpo-35348: Make parsing the output of the file command in platform.ar…

…chitecture() more reliable.
python · serhiy-storchaka · Dec 14, 2018 · Dec 14, 2018 · Dec 14, 2018 · d28bce6b6fb1ae0909fa1b69bc41dee3ac5da489
commit d28bce6b6fb1ae0909fa1b69bc41dee3ac5da489
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -610,11 +610,13 @@ def _syscmd_file(target, default=''):
     target = _follow_symlinks(target)
     try:
         output = subprocess.check_output(['file', target],
-                                         stderr=subprocess.DEVNULL,
-                                         encoding='latin-1')
+                                         stderr=subprocess.DEVNULL)
     except (OSError, subprocess.CalledProcessError):
         return default
-    return (output or default)
+    prefix = os.fsencode(target) + b': '
+    if output.startswith(prefix):
+        output = output[len(prefix):]
+    return (os.fsdecode(output) or default)
 
 ### Information about the used architecture
 
@@ -676,7 +678,7 @@ def architecture(executable=sys.executable, bits='', linkage=''):
                 linkage = l
         return bits, linkage
 
-    if 'executable' not in fileout:
+    if 'executable' not in fileout and 'shared object' not in fileout:
         # Format not supported
         return bits, linkage
 

diff --git a/Misc/NEWS.d/next/Library/2018-12-14-16-52-00.bpo-35348.z4sCtb.rst b/Misc/NEWS.d/next/Library/2018-12-14-16-52-00.bpo-35348.z4sCtb.rst
@@ -0,0 +1,2 @@
+Make parsing the output of the ``file`` command in
+:func:`platform.architecture`: more reliable.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Make parsing the output of the ``file`` command in
		:func:`platform.architecture`: more reliable.