mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-17 22:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Backed out changeset 5abacebec9d2

Browse source
This commit is contained in:
Jesus Cea 2012-10-04 15:06:57 +02:00
parent 82a3924122
commit 3e94e14a68
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/platform.py
View file

@ -113,7 +113,7 @@ __copyright__ = """
__version__ = '1.0.7'
import sys,string,os,re
import sys,string,os,re,subprocess
### Globals & Constants
@ -1023,13 +1023,16 @@ def _syscmd_file(target,default=''):
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 "%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 = string.strip(f.read())
rc = f.close()
output = proc.stdout.read()
rc = proc.wait()
if not output or rc:
return default
else: