← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
1782
1782
                 help="Read-only access of branches exported on the web.")
1783
1783
register_transport_proto('https://',
1784
1784
            help="Read-only access of branches exported on the web using SSL.")
1785
 
# The default http implementation is urllib, but https is pycurl if available
 
1785
# The default http implementation is urllib, but https uses pycurl if available
1786
1786
register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
1787
1787
                        'PyCurlTransport')
1788
1788
register_lazy_transport('http://', 'bzrlib.transport.http._urllib',