Backed out changeset c73b90b6dadd

This commit is contained in:
Jesus Cea 2012-10-04 14:22:16 +02:00
parent 95038fa526
commit 82a3924122
3 changed files with 5 additions and 12 deletions

View File

@ -113,7 +113,7 @@ __copyright__ = """
__version__ = '1.0.7'
import sys,string,os,re,subprocess
import sys,string,os,re
### Globals & Constants
@ -1023,16 +1023,13 @@ 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:
with open(DEV_NULL) as dev_null:
proc = subprocess.Popen(['file', '-b', '--', target],
stdout=subprocess.PIPE, stderr=dev_null)
f = os.popen('file "%s" 2> %s' % (target, DEV_NULL))
except (AttributeError,os.error):
return default
output = proc.stdout.read()
rc = proc.wait()
output = string.strip(f.read())
rc = f.close()
if not output or rc:
return default
else:

View File

@ -77,7 +77,6 @@ Reimer Behrends
Ben Bell
Thomas Bellman
Alexander “Саша” Belopolsky
David Benjamin
Andrew Bennetts
Andy Bensky
Bennett Benson

View File

@ -143,9 +143,6 @@ Library
io.BytesIO and io.StringIO objects now raise ValueError when the object has
been closed. Patch by Alessandro Moura.
- Issue #16112: platform.architecture does not correctly escape argument to
/usr/bin/file. Patch by David Benjamin.
- Issue #12776,#11839: call argparse type function (specified by add_argument)
only once. Before, the type function was called twice in the case where the
default was specified and the argument was given as well. This was