Skip to content

bpo-35348: Fix platform.architecture() #11159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Dec 17, 2018
Merged

bpo-35348: Fix platform.architecture() #11159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ab40aa
bpo-35348: Fix platform.architecture()
vstinner Dec 14, 2018
7188303
Fix typo: LC_ALL='c' => LC_ALL='C'
vstinner Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Lib/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,13 +608,21 @@ def _syscmd_file(target, default=''):

import subprocess
target = _follow_symlinks(target)
# "file" output is locale dependent: force the usage of the C locale
# to get deterministic behavior.
env = dict(os.environ, LC_ALL='C')
try:
output = subprocess.check_output(['file', target],
# -b: do not prepend filenames to output lines (brief mode)
output = subprocess.check_output(['file', '-b', target],
stderr=subprocess.DEVNULL,
encoding='latin-1')
env=env)
except (OSError, subprocess.CalledProcessError):
return default
return (output or default)
if not output:
return default
# With the C locale, the output should be mostly ASCII-compatible.
# Decode from Latin-1 to prevent Unicode decode error.
return output.decode('latin-1')

### Information about the used architecture

Expand Down Expand Up @@ -676,7 +684,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

Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2018-12-14-13-27-45.bpo-35348.u3Y2an.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Make :func:`platform.architecture` parsing of ``file`` command output more
reliable: add the ``-b`` option to the ``file`` command to omit the filename,
force the usage of the C locale, and search also the "shared object" pattern.