aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollin Winter <collinw@gmail.com>2007-08-30 18:18:27 +0000
committerCollin Winter <collinw@gmail.com>2007-08-30 18:18:27 +0000
commit4902e69e40b7f73bbb5e02a64260a8cf03651c80 (patch)
tree12a2c1b76a83be906e764c5d36e3055232ef70da
parentKill more lingering string exceptions in Lib/plat-mac/. (diff)
downloadcpython-4902e69e40b7f73bbb5e02a64260a8cf03651c80.tar.gz
cpython-4902e69e40b7f73bbb5e02a64260a8cf03651c80.tar.bz2
cpython-4902e69e40b7f73bbb5e02a64260a8cf03651c80.zip
More raise statement normalization.
-rw-r--r--Demo/scripts/toaiff.py8
-rwxr-xr-xLib/UserString.py4
-rw-r--r--Lib/encodings/utf_32.py2
-rw-r--r--Parser/asdl.py2
4 files changed, 8 insertions, 8 deletions
diff --git a/Demo/scripts/toaiff.py b/Demo/scripts/toaiff.py
index 438d225dd8d..57948591bb1 100644
--- a/Demo/scripts/toaiff.py
+++ b/Demo/scripts/toaiff.py
@@ -80,7 +80,7 @@ def _toaiff(filename, temps):
temps.append(fname)
sts = uncompress.copy(filename, fname)
if sts:
- raise error, filename + ': uncompress failed'
+ raise error(filename + ': uncompress failed')
else:
fname = filename
try:
@@ -93,15 +93,15 @@ def _toaiff(filename, temps):
msg = msg[1]
if type(msg) != type(''):
msg = repr(msg)
- raise error, filename + ': ' + msg
+ raise error(filename + ': ' + msg)
if ftype == 'aiff':
return fname
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()
os.close(fd)
temps.append(temp)
sts = table[ftype].copy(fname, temp)
if sts:
- raise error, filename + ': conversion to aiff failed'
+ raise error(filename + ': conversion to aiff failed')
return temp
diff --git a/Lib/UserString.py b/Lib/UserString.py
index c55c1bf1a77..de50396455c 100755
--- a/Lib/UserString.py
+++ b/Lib/UserString.py
@@ -197,7 +197,7 @@ class MutableString(UserString):
elif step != 1:
# XXX(twouters): I guess we should be reimplementing
# 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)
self.data = self.data[:start] + sub + self.data[stop:]
else:
@@ -212,7 +212,7 @@ class MutableString(UserString):
start, stop = stop+1, start+1
elif step != 1:
# 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)
self.data = self.data[:start] + self.data[stop:]
else:
diff --git a/Lib/encodings/utf_32.py b/Lib/encodings/utf_32.py
index 4bbd22a019e..f0b7709a23c 100644
--- a/Lib/encodings/utf_32.py
+++ b/Lib/encodings/utf_32.py
@@ -127,7 +127,7 @@ class StreamReader(codecs.StreamReader):
elif byteorder == 1:
self.decode = codecs.utf_32_be_decode
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)
### encodings module API
diff --git a/Parser/asdl.py b/Parser/asdl.py
index a3701e6261b..8fbd9ec9fe1 100644
--- a/Parser/asdl.py
+++ b/Parser/asdl.py
@@ -103,7 +103,7 @@ class ASDLScanner(spark.GenericScanner, object):
def t_default(self, s):
r" . +"
- raise ValueError, "unmatched input: %r" % s
+ raise ValueError("unmatched input: %r" % s)
class ASDLParser(spark.GenericParser, object):
def __init__(self):