Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Made the 'info' argument to SyntaxError optional, so phase-2 syntax 

errors are handled (these gave ``TypeError: not enough arguments'').

Also changed its __str__() to correct a typo (missing self.) and
return str(self.msg) to ensure the result is always string.

Also changed the default __str__ to simply return str(self.args).
This commit is contained in:
Guido van Rossum 1997-09-05 19:00:56 +00:00
parent 49bb0e32a0
commit f394f56c2b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/exceptions.py
View File

@ -58,10 +58,8 @@ class StandardError:
def __str__(self): def __str__(self):
if self.args == None: if self.args == None:
return '' return ''
elif type(self.args) == type(''):
return self.args
else: else:
return `self.args` return str(self.args)
def __getitem__(self, i): def __getitem__(self, i):
if type(self.args) == type(()): if type(self.args) == type(()):
@ -72,12 +70,17 @@ class StandardError:
raise IndexError raise IndexError
class SyntaxError(StandardError): class SyntaxError(StandardError):
def __init__(self, msg, info): filename = lineno = offset = text = None
def __init__(self, msg, info=None):
self.msg = msg self.msg = msg
if info:
self.args = msg
else:
self.args = (msg, info)
if info:
self.filename, self.lineno, self.offset, self.text = info self.filename, self.lineno, self.offset, self.text = info
def __str__(self): def __str__(self):
return msg return str(self.msg)
class IOError(StandardError): class IOError(StandardError):