From: Guido van Rossum Date: Sat, 25 Aug 2007 14:55:35 +0000 (+0000) Subject: Cosmetic fixes to make this work with Py3k (as well as with 2.5 still). X-Git-Tag: v3.0a1~262 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dd2c829927b20019d09c094cd7237c44cb235ef;p=thirdparty%2FPython%2Fcpython.git Cosmetic fixes to make this work with Py3k (as well as with 2.5 still). Patch by Christian Heimes. --- diff --git a/Doc/tools/roman.py b/Doc/tools/roman.py index 33f6db7ed3a7..89ef617e6e71 100644 --- a/Doc/tools/roman.py +++ b/Doc/tools/roman.py @@ -40,9 +40,9 @@ romanNumeralMap = (('M', 1000), def toRoman(n): """convert integer to Roman numeral""" if not (0 < n < 5000): - raise OutOfRangeError, "number out of range (must be 1..4999)" - if int(n) <> n: - raise NotIntegerError, "decimals can not be converted" + raise OutOfRangeError("number out of range (must be 1..4999)") + if int(n) != n: + raise NotIntegerError("decimals can not be converted") result = "" for numeral, integer in romanNumeralMap: @@ -67,9 +67,9 @@ romanNumeralPattern = re.compile(""" def fromRoman(s): """convert Roman numeral to integer""" if not s: - raise InvalidRomanNumeralError, 'Input can not be blank' + raise InvalidRomanNumeralError('Input can not be blank') if not romanNumeralPattern.search(s): - raise InvalidRomanNumeralError, 'Invalid Roman numeral: %s' % s + raise InvalidRomanNumeralError('Invalid Roman numeral: %s' % s) result = 0 index = 0