/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Martin Pool
  • Date: 2009-08-26 05:38:16 UTC
  • mfrom: (4634.6.2 2.0)
  • mto: (4634.6.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: mbp@sourcefrog.net-20090826053816-ht6jpktdm77vi6t5
Merge 2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
2006
2006
 
2007
2007
class BadConversionTarget(BzrError):
2008
2008
 
2009
 
    _fmt = "Cannot convert to format %(format)s.  %(problem)s"
 
2009
    _fmt = "Cannot convert from format %(from_format)s to format %(format)s." \
 
2010
            "    %(problem)s"
2010
2011
 
2011
 
    def __init__(self, problem, format):
 
2012
    def __init__(self, problem, format, from_format=None):
2012
2013
        BzrError.__init__(self)
2013
2014
        self.problem = problem
2014
2015
        self.format = format
 
2016
        self.from_format = from_format or '(unspecified)'
2015
2017
 
2016
2018
 
2017
2019
class NoDiffFound(BzrError):
2918
2920
    _fmt = 'Cannot bind address "%(host)s:%(port)i": %(orig_error)s.'
2919
2921
 
2920
2922
    def __init__(self, host, port, orig_error):
 
2923
        # nb: in python2.4 socket.error doesn't have a useful repr
2921
2924
        BzrError.__init__(self, host=host, port=port,
2922
 
            orig_error=orig_error[1])
 
2925
            orig_error=repr(orig_error.args))
2923
2926
 
2924
2927
 
2925
2928
class UnknownRules(BzrError):