← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
138
138
def register_lazy_transport(prefix, module, classname):
139
139
    if not prefix in transport_list_registry:
140
140
        register_transport_proto(prefix)
141
 
    transport_list_registry.register_lazy_transport_provider(prefix, module, classname)
142
 
 
143
 
 
144
 
def register_transport(prefix, klass, override=DEPRECATED_PARAMETER):
 
141
    transport_list_registry.register_lazy_transport_provider(
 
142
        prefix, module, classname)
 
143
 
 
144
 
 
145
def register_transport(prefix, klass):
145
146
    if not prefix in transport_list_registry:
146
147
        register_transport_proto(prefix)
147
148
    transport_list_registry.register_transport_provider(prefix, klass)
1782
1783
                 help="Read-only access of branches exported on the web.")
1783
1784
register_transport_proto('https://',
1784
1785
            help="Read-only access of branches exported on the web using SSL.")
1785
 
# The default http implementation is urllib, but https uses pycurl if available
 
1786
# The default http implementation is urllib
1786
1787
register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
1787
1788
                        'PyCurlTransport')
1788
1789
register_lazy_transport('http://', 'bzrlib.transport.http._urllib',
1789
1790
                        'HttpTransport_urllib')
 
1791
register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
 
1792
                        'PyCurlTransport')
1790
1793
register_lazy_transport('https://', 'bzrlib.transport.http._urllib',
1791
1794
                        'HttpTransport_urllib')
1792
 
register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
1793
 
                        'PyCurlTransport')
1794
1795
 
1795
1796
register_transport_proto('ftp://', help="Access using passive FTP.")
1796
1797
register_lazy_transport('ftp://', 'bzrlib.transport.ftp', 'FtpTransport')