/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/_pycurl.py

Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
81
81
 
82
82
    def __init__(self, base, from_transport=None):
83
83
        super(PyCurlTransport, self).__init__(base)
 
84
        if base.startswith('https'):
 
85
            # Check availability of https into pycurl supported
 
86
            # protocols
 
87
            supported = pycurl.version_info()[8]
 
88
            if 'https' not in supported:
 
89
                raise DependencyNotPresent('pycurl', 'no https support')
84
90
        self.cabundle = ca_bundle.get_ca_path()
85
91
        if from_transport is not None:
86
92
            self._curl = from_transport._curl