← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

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(
1984
1985
        self.prefix = prefix
1985
1986
 
1986
1987
 
1987
 
class MalformedTransform(BzrError):
 
1988
class MalformedTransform(InternalBzrError):
1988
1989
 
1989
1990
    _fmt = "Tree transform is malformed %(conflicts)r"
1990
1991
 
3354
3355
    def __init__(self, method, arguments):
3355
3356
        self.method = method
3356
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