← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-27 15:38:14 UTC
  • mfrom: (6015.44.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6236.
  • Revision ID: v.ladeuil+lp@free.fr-20111027153814-0r4nd2io1jv6t47f
Merge 2.4 into trunk including fix for bug #880701

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1666
1666
 
1667
1667
    def __init__(self, exc_info):
1668
1668
        import traceback
 
1669
        # GZ 2010-08-10: Cycle with exc_tb/exc_info affects at least one test
1669
1670
        self.exc_type, self.exc_value, self.exc_tb = exc_info
1670
1671
        self.exc_info = exc_info
1671
1672
        traceback_strings = traceback.format_exception(
1710
1711
    _fmt = "Connection closed: %(msg)s %(orig_error)s"
1711
1712
 
1712
1713
 
 
1714
class ConnectionTimeout(ConnectionError):
 
1715
 
 
1716
    _fmt = "Connection Timeout: %(msg)s%(orig_error)s"
 
1717
 
 
1718
 
1713
1719
class InvalidRange(TransportError):
1714
1720
 
1715
1721
    _fmt = "Invalid range access in %(path)s at %(offset)s: %(msg)s"
1979
1985
        self.prefix = prefix
1980
1986
 
1981
1987
 
1982
 
class MalformedTransform(BzrError):
 
1988
class MalformedTransform(InternalBzrError):
1983
1989
 
1984
1990
    _fmt = "Tree transform is malformed %(conflicts)r"
1985
1991
 
3349
3355
    def __init__(self, method, arguments):
3350
3356
        self.method = method
3351
3357
        self.arguments = arguments
 
3358
 
 
3359
 
 
3360
class UnsupportedKindChange(BzrError):
 
3361
 
 
3362
    _fmt = ("Kind change from %(from_kind)s to %(to_kind)s for "
 
3363
            "%(path)s not supported by format %(format)r")
 
3364
 
 
3365
    def __init__(self, path, from_kind, to_kind, format):
 
3366
        self.path = path
 
3367
        self.from_kind = from_kind
 
3368
        self.to_kind = to_kind
 
3369
        self.format = format