/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-03-14 10:11:58 UTC
  • mfrom: (5609.24.1 2.3)
  • mto: (5609.24.2 2.3)
  • mto: This revision was merged to the branch mainline in revision 5723.
  • Revision ID: v.ladeuil+lp@free.fr-20110314101158-9ojis0ftsljg3c3t
Merge bzr/2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
30
30
from bzrlib import (
31
31
    debug,
32
32
    errors,
 
33
    transport,
33
34
    ui,
34
35
    urlutils,
35
36
    )
41
42
from bzrlib.transport import (
42
43
    ConnectedTransport,
43
44
    _CoalescedOffset,
44
 
    get_transport,
45
45
    Transport,
46
46
    )
47
47
 
570
570
                                            self._user, self._password,
571
571
                                            host, port,
572
572
                                            base_path)
573
 
                new_transport = get_transport(new_url)
 
573
                new_transport = transport.get_transport(new_url)
574
574
        else:
575
575
            # Redirected to a different protocol
576
576
            new_url = self._unsplit_url(scheme,
577
577
                                        user, password,
578
578
                                        host, port,
579
579
                                        base_path)
580
 
            new_transport = get_transport(new_url)
 
580
            new_transport = transport.get_transport(new_url)
581
581
        return new_transport
582
582
 
583
583