← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
77
77
            fake_base, _from_transport=_from_transport)
78
78
        # The following is needed to minimize the effects of our trick above
79
79
        # while retaining the best compatibility.
80
 
        self._parsed_url.scheme = _hooked_scheme
81
 
        super(ConnectedTransport, self).__init__(str(self._parsed_url))
 
80
        self._scheme = _hooked_scheme
 
81
        base = self._unsplit_url(self._scheme,
 
82
                                 self._user, self._password,
 
83
                                 self._host, self._port,
 
84
                                 self._path)
 
85
        super(ConnectedTransport, self).__init__(base)
82
86
 
83
87
 
84
88
class ConnectionHookedTransport(InstrumentedTransport):
108
112
        # standard test support code will work and permit the server url
109
113
        # correctly.
110
114
        url = self.get_url()
111
 
        t = transport.get_transport_from_url(url)
 
115
        t = transport.get_transport(url)
112
116
        if t.base.endswith('work/'):
113
117
            t = t.clone('../..')
114
118
        self.permit_url(t.base)