mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 20:25:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #16706: get rid of os.error

Browse source
This commit is contained in:
Andrew Svetlov 2012-12-18 22:02:39 +02:00
parent a191959849
commit ad28c7f9da
33 changed files with 4089 additions and 4123 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/platform.py
View file

@ -316,7 +316,7 @@ def linux_distribution(distname='', version='', id='',
"""
try:
etc = os.listdir('/etc')
except os.error:
except OSError:
# Probably not a Unix system
return distname,version,id
etc.sort()
@ -424,10 +424,10 @@ def _syscmd_ver(system='', release='', version='',
pipe = popen(cmd)
info = pipe.read()
if pipe.close():
raise os.error('command failed')
raise OSError('command failed')
# XXX How can I suppress shell errors from being written
# to stderr ?
except os.error as why:
except OSError as why:
#print 'Command %s failed: %s' % (cmd,why)
continue
except IOError as why:
@ -906,7 +906,7 @@ def _syscmd_uname(option,default=''):
return default
try:
f = os.popen('uname %s 2> %s' % (option, DEV_NULL))
except (AttributeError,os.error):
except (AttributeError, OSError):
return default
output = f.read().strip()
rc = f.close()
@ -932,7 +932,7 @@ def _syscmd_file(target,default=''):
proc = subprocess.Popen(['file', target],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
except (AttributeError,os.error):
except (AttributeError, OSError):
return default
output = proc.communicate()[0].decode('latin-1')
rc = proc.wait()