← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from cStringIO import StringIO
18
 
import urllib
19
 
import urlparse
 
17
from __future__ import absolute_import
20
18
 
21
19
from bzrlib import (
22
20
    errors,
23
21
    trace,
24
 
    urlutils,
25
22
    )
26
23
from bzrlib.transport import http
27
24
# TODO: handle_response should be integrated into the http/__init__.py
41
38
 
42
39
    _opener_class = Opener
43
40
 
44
 
    def __init__(self, base, _from_transport=None):
 
41
    def __init__(self, base, _from_transport=None, ca_certs=None):
45
42
        super(HttpTransport_urllib, self).__init__(
46
43
            base, 'urllib', _from_transport=_from_transport)
47
44
        if _from_transport is not None:
48
45
            self._opener = _from_transport._opener
49
46
        else:
50
47
            self._opener = self._opener_class(
51
 
                report_activity=self._report_activity)
 
48
                report_activity=self._report_activity, ca_certs=ca_certs)
52
49
 
53
50
    def _perform(self, request):
54
51
        """Send the request to the server and handles common errors.
178
175
        )
179
176
    permutations = [(HttpTransport_urllib, http_server.HttpServer_urllib),]
180
177
    if features.HTTPSServerFeature.available():
181
 
        from bzrlib.tests import https_server
182
 
        permutations.append((HttpTransport_urllib,
 
178
        from bzrlib.tests import (
 
179
            https_server,
 
180
            ssl_certs,
 
181
            )
 
182
 
 
183
        class HTTPS_urllib_transport(HttpTransport_urllib):
 
184
 
 
185
            def __init__(self, base, _from_transport=None):
 
186
                super(HTTPS_urllib_transport, self).__init__(
 
187
                    base, _from_transport=_from_transport,
 
188
                    ca_certs=ssl_certs.build_path('ca.crt'))
 
189
 
 
190
        permutations.append((HTTPS_urllib_transport,
183
191
                             https_server.HTTPSServer_urllib))
184
192
    return permutations