~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import bzrlib.hooks
 
18
from bzrlib import transport
18
19
from bzrlib.tests import features
19
20
 
20
21
# SFTPTransport offers better performances but relies on paramiko, if paramiko
34
35
 
35
36
from bzrlib.transport import (
36
37
    ConnectedTransport,
37
 
    get_transport,
38
38
    register_transport,
39
39
    register_urlparse_netloc_protocol,
40
40
    unregister_transport,
47
47
    """Dict-mapping hook name to a list of callables for transport hooks"""
48
48
 
49
49
    def __init__(self):
50
 
        super(TransportHooks, self).__init__()
 
50
        super(TransportHooks, self).__init__("bzrlib.tests.transport_util",
 
51
            "InstrumentedTransport.hooks")
51
52
        # Invoked when the transport has just created a new connection.
52
53
        # The api signature is (transport, connection, credentials)
53
54
        self['_set_connection'] = []
111
112
        # standard test support code will work and permit the server url
112
113
        # correctly.
113
114
        url = self.get_url()
114
 
        t = get_transport(url)
 
115
        t = transport.get_transport(url)
115
116
        if t.base.endswith('work/'):
116
117
            t = t.clone('../..')
117
118
        self.permit_url(t.base)