← Back to branch summary

~andy-groveronline/simpleparse/fixes

« back to all changes in this revision

Viewing changes to error.py

  • Committer: Mike C. Fletcher
  • Date: 2009-04-05 03:55:17 UTC
  • Revision ID: mcfletch@sturm-20090405035517-sk9xxmhe2uqiztk3
2.1.1a1 release, fixes for 2.6 compatibility and to eliminate conflict on name simpleparse.xml with xml package in standard distribution

Show diffs side-by-side

added added

removed removed

Lines of Context:
error.py
22
22
        line = -1
23
23
        production = ""
24
24
        expected = ""
 
25
        error_message = None
25
26
        DEFAULTTEMPLATE = """Failed parsing production "%(production)s" @pos %(position)s (~line %(line)s:%(lineChar)s).\nExpected syntax: %(expected)s\nGot text: %(text)s"""
26
27
        def __str__( self ):
27
28
                """Create a string representation of the error"""
28
 
                if self.message:
29
 
                        return '%s: %s'%( self.__class__.__name__, self.messageFormat(self.message) )
 
29
                if self.error_message:
 
30
                        return '%s: %s'%( self.__class__.__name__, self.messageFormat(self.error_message) )
30
31
                else:
31
32
                        return '%s: %s'%( self.__class__.__name__, self.messageFormat() )
32
33
        def messageFormat( self, template=None):