diff options
author | Jesus Cea <jcea@jcea.es> | 2012-10-05 02:50:17 (GMT) |
---|---|---|
committer | Jesus Cea <jcea@jcea.es> | 2012-10-05 02:50:17 (GMT) |
commit | 69e7c9b1fd616c4c7c667e356be478db0df1dabf (patch) | |
tree | b889cc453da713a0e4e045c12b9f724a7e0135b6 /Lib/platform.py | |
parent | 45c0766c02b7c6344e37554c72ec0d8273d089eb (diff) | |
download | cpython-69e7c9b1fd616c4c7c667e356be478db0df1dabf.zip cpython-69e7c9b1fd616c4c7c667e356be478db0df1dabf.tar.gz cpython-69e7c9b1fd616c4c7c667e356be478db0df1dabf.tar.bz2 |
#16112: platform.architecture does not correctly escape argument to /usr/bin/file. Use 'communicate()'
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-x | Lib/platform.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index d177499..10b04bd 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1045,13 +1045,12 @@ def _syscmd_file(target,default=''): 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', '-b', '--', target], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) except (AttributeError,os.error): return default - output = proc.stdout.read() + output = proc.communicate()[0] rc = proc.wait() if not output or rc: return default |