Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

More raise statement normalization.

Browse source
This commit is contained in:
Collin Winter 2007-08-30 18:18:27 +00:00
parent 6cd2a2036d
commit 4902e69e40
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Demo/scripts/toaiff.py
View file

@ -80,7 +80,7 @@ def _toaiff(filename, temps):
temps.append(fname) temps.append(fname)
sts = uncompress.copy(filename, fname) sts = uncompress.copy(filename, fname)
if sts: if sts:
raise error, filename + ': uncompress failed' raise error(filename + ': uncompress failed')
else: else:
fname = filename fname = filename
try: try:
@ -93,15 +93,15 @@ def _toaiff(filename, temps):
msg = msg[1] msg = msg[1]
if type(msg) != type(''): if type(msg) != type(''):
msg = repr(msg) msg = repr(msg)
raise error, filename + ': ' + msg raise error(filename + ': ' + msg)
if ftype == 'aiff': if ftype == 'aiff':
return fname return fname
if ftype is None or not ftype in table: if ftype is None or not ftype in table:
raise error, '%s: unsupported audio file type %r' % (filename, ftype) raise error('%s: unsupported audio file type %r' % (filename, ftype))
(fd, temp) = tempfile.mkstemp() (fd, temp) = tempfile.mkstemp()
os.close(fd) os.close(fd)
temps.append(temp) temps.append(temp)
sts = table[ftype].copy(fname, temp) sts = table[ftype].copy(fname, temp)
if sts: if sts:
raise error, filename + ': conversion to aiff failed' raise error(filename + ': conversion to aiff failed')
return temp return temp

4
Lib/UserString.py
View file

@ -197,7 +197,7 @@ def __setitem__(self, index, sub):
elif step != 1: elif step != 1:
# XXX(twouters): I guess we should be reimplementing # XXX(twouters): I guess we should be reimplementing
# the extended slice assignment/deletion algorithm here... # the extended slice assignment/deletion algorithm here...
raise TypeError, "invalid step in slicing assignment" raise TypeError("invalid step in slicing assignment")
start = min(start, stop) start = min(start, stop)
self.data = self.data[:start] + sub + self.data[stop:] self.data = self.data[:start] + sub + self.data[stop:]
else: else:
@ -212,7 +212,7 @@ def __delitem__(self, index):
start, stop = stop+1, start+1 start, stop = stop+1, start+1
elif step != 1: elif step != 1:
# XXX(twouters): see same block in __setitem__ # XXX(twouters): see same block in __setitem__
raise TypeError, "invalid step in slicing deletion" raise TypeError("invalid step in slicing deletion")
start = min(start, stop) start = min(start, stop)
self.data = self.data[:start] + self.data[stop:] self.data = self.data[:start] + self.data[stop:]
else: else:

2
Lib/encodings/utf_32.py
View file

@ -127,7 +127,7 @@ def decode(self, input, errors='strict'):
elif byteorder == 1: elif byteorder == 1:
self.decode = codecs.utf_32_be_decode self.decode = codecs.utf_32_be_decode
elif consumed>=4: elif consumed>=4:
raise UnicodeError,"UTF-32 stream does not start with BOM" raise UnicodeError("UTF-32 stream does not start with BOM")
return (object, consumed) return (object, consumed)
### encodings module API ### encodings module API

2
Parser/asdl.py
View file

@ -103,7 +103,7 @@ def t_whitespace(self, s):
def t_default(self, s): def t_default(self, s):
r" . +" r" . +"
raise ValueError, "unmatched input: %r" % s raise ValueError("unmatched input: %r" % s)
class ASDLParser(spark.GenericParser, object): class ASDLParser(spark.GenericParser, object):
def __init__(self): def __init__(self):