~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
82
82
            return directive, transport
83
83
        else:
84
84
            return _serializer.read_bundle(f), transport
 
85
    except errors.ConnectionReset:
 
86
        raise
85
87
    except (errors.TransportError, errors.PathError), e:
86
88
        raise errors.NotABundle(str(e))
87
89
    except (IOError,), e: