← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2008-12-10 17:22:13 UTC
  • mfrom: (3890 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3912.
  • Revision ID: john@arbash-meinel.com-20081210172213-h2b0auuil3qaz28u
Merge bzr.dev 3890, bring in the FIFOCache.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
84
84
def _get_transport_modules():
85
85
    """Return a list of the modules providing transports."""
86
86
    modules = set()
87
 
    for prefix, factory_list in transport_list_registry.iteritems():
 
87
    for prefix, factory_list in transport_list_registry.items():
88
88
        for factory in factory_list:
89
89
            if hasattr(factory, "_module_name"):
90
90
                modules.add(factory._module_name)
1587
1587
                    possible_transports.append(t_same_connection)
1588
1588
                return t_same_connection
1589
1589
 
1590
 
    for proto, factory_list in transport_list_registry.iteritems():
 
1590
    for proto, factory_list in transport_list_registry.items():
1591
1591
        if proto is not None and base.startswith(proto):
1592
1592
            transport, last_err = _try_transport_factories(base, factory_list)
1593
1593
            if transport:
1739
1739
                 help="Read-only access of branches exported on the web.")
1740
1740
register_transport_proto('https://',
1741
1741
            help="Read-only access of branches exported on the web using SSL.")
 
1742
# The default http implementation is urllib, but https is pycurl if available
 
1743
register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
 
1744
                        'PyCurlTransport')
1742
1745
register_lazy_transport('http://', 'bzrlib.transport.http._urllib',
1743
1746
                        'HttpTransport_urllib')
1744
1747
register_lazy_transport('https://', 'bzrlib.transport.http._urllib',
1745
1748
                        'HttpTransport_urllib')
1746
 
register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
1747
 
                        'PyCurlTransport')
1748
1749
register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
1749
1750
                        'PyCurlTransport')
1750
1751