[Python-checkins] cpython (merge 3.3 -> default): MERGE: Closes #16112: platform.architecture does not correctly escape argument
jesus.cea
python-checkins at python.org
Thu Oct 4 13:58:46 CEST 2012
http://hg.python.org/cpython/rev/cd026866b333
changeset: 79448:cd026866b333
parent: 79444:4141c36954cd
parent: 79447:3112bf7e0ecb
user: Jesus Cea <jcea at jcea.es>
date: Thu Oct 04 13:58:22 2012 +0200
summary:
MERGE: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file
files:
Lib/platform.py | 13 ++++++++-----
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -112,7 +112,7 @@
__version__ = '1.0.7'
import collections
-import sys, os, re
+import sys, os, re, subprocess
### Globals & Constants
@@ -922,13 +922,16 @@
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:
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -93,6 +93,7 @@
Thomas Bellman
Alexander “Саша” Belopolsky
Eli Bendersky
+David Benjamin
Andrew Bennetts
Andy Bensky
Bennett Benson
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,6 +65,9 @@
- Issue #15421: Fix an OverflowError in `Calendar.itermonthdates()` after
`datetime.MAXYEAR`. Patch by Cédric Krier.
+- Issue #16112: platform.architecture does not correctly escape argument to
+ /usr/bin/file. Patch by David Benjamin.
+
- Issue #15970: `xml.etree.ElementTree` now serializes correctly the empty HTML
elements 'meta' and 'param'.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list