← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-06 15:15:44 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110506151544-atzxeezfwssnlacr
Merge bzr.dev 5835 in prep for release-notes updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1766
1766
 
1767
1767
class ParseConfigError(BzrError):
1768
1768
 
 
1769
    _fmt = "Error(s) parsing config file %(filename)s:\n%(errors)s"
 
1770
 
1769
1771
    def __init__(self, errors, filename):
1770
 
        if filename is None:
1771
 
            filename = ""
1772
 
        message = "Error(s) parsing config file %s:\n%s" % \
1773
 
            (filename, ('\n'.join(e.msg for e in errors)))
1774
 
        BzrError.__init__(self, message)
 
1772
        BzrError.__init__(self)
 
1773
        self.filename = filename
 
1774
        self.errors = '\n'.join(e.msg for e in errors)
1775
1775
 
1776
1776
 
1777
1777
class NoEmailInUsername(BzrError):