Cosmetic fixes to make this work with Py3k (as well as with 2.5 still).

Patch by Christian Heimes.
This commit is contained in:
Guido van Rossum 2007-08-25 14:55:35 +00:00
parent 6398b7a351
commit 1dd2c82992
1 changed files with 5 additions and 5 deletions

View File

@ -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