changeset:   79490:b9ac3c44a4eb
parent:      79484:e278f3ab0190
parent:      79489:64a0caf49429
user:        Jesus Cea <jcea@jcea.es>
date:        Fri Oct 05 05:32:10 2012 +0200
files:       Lib/platform.py
description:
MERGE: #16112: platform.architecture does not correctly escape argument to /usr/bin/file. Fix original patch


diff -r e278f3ab0190 -r b9ac3c44a4eb Lib/platform.py
--- a/Lib/platform.py	Fri Oct 05 04:02:41 2012 +0200
+++ b/Lib/platform.py	Fri Oct 05 05:32:10 2012 +0200
@@ -924,13 +924,12 @@
         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