Commit 1dd2c829 authored by Guido van Rossum's avatar Guido van Rossum

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

Patch by Christian Heimes.
parent 6398b7a3
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment