mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 07:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 79558 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79558 | florent.xicluna | 2010-04-01 21:17:09 +0300 (Thu, 01 Apr 2010) | 2 lines

  #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
This commit is contained in:
Ezio Melotti 2010-08-02 20:26:41 +00:00
parent 507ea2ae18
commit b55d368055
6 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/platform.py
View file

@ -1012,7 +1012,7 @@ def _syscmd_file(target,default=''):
if sys.platform in ('dos','win32','win16','os2'):
# XXX Others too ?
return default
target = _follow_symlinks(target)
target = _follow_symlinks(target).replace('"', '\\"')
try:
f = os.popen('file "%s" 2> /dev/null' % target)
except (AttributeError,os.error):
@ -1078,13 +1078,13 @@ def architecture(executable=sys.executable,bits='',linkage=''):
executable == sys.executable:
# "file" command did not return anything; we'll try to provide
# some sensible defaults then...
if _default_architecture.has_key(sys.platform):
b,l = _default_architecture[sys.platform]
if sys.platform in _default_architecture:
b, l = _default_architecture[sys.platform]
if b:
bits = b
if l:
linkage = l
return bits,linkage
return bits, linkage
# Split the output into a list of strings omitting the filename
fileout = _architecture_split(output)[1:]