← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: Martin
  • Date: 2011-01-26 19:34:58 UTC
  • mto: (5609.10.1 2.3b5-dev)
  • mto: This revision was merged to the branch mainline in revision 5635.
  • Revision ID: gzlist@googlemail.com-20110126193458-o6mwxaymyinlzqjo
Blindly change all users of get_transport to address the function via the transport module

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/server.py
27
27
from bzrlib import (
28
28
    errors,
29
29
    trace,
30
 
    transport,
 
30
    transport as _mod_transport,
31
31
)
32
32
from bzrlib.lazy_import import lazy_import
33
33
lazy_import(globals(), """
34
34
from bzrlib.smart import medium
35
35
from bzrlib.transport import (
36
36
    chroot,
37
 
    get_transport,
38
37
    pathfilter,
39
38
    )
40
39
from bzrlib import (
327
326
        chroot_server = chroot.ChrootServer(transport)
328
327
        chroot_server.start_server()
329
328
        self.cleanups.append(chroot_server.stop_server)
330
 
        transport = get_transport(chroot_server.get_url())
 
329
        transport = _mod_transport.get_transport(chroot_server.get_url())
331
330
        if self.base_path is not None:
332
331
            # Decorate the server's backing transport with a filter that can
333
332
            # expand homedirs.
334
333
            expand_userdirs = self._make_expand_userdirs_filter(transport)
335
334
            expand_userdirs.start_server()
336
335
            self.cleanups.append(expand_userdirs.stop_server)
337
 
            transport = get_transport(expand_userdirs.get_url())
 
336
            transport = _mod_transport.get_transport(expand_userdirs.get_url())
338
337
        self.transport = transport
339
338
 
340
339
    def _make_smart_server(self, host, port, inet):