/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/tests/https_server.py

  • Committer: Jelmer Vernooij
  • Date: 2009-02-25 15:36:48 UTC
  • mfrom: (4048 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4050.
  • Revision ID: jelmer@samba.org-20090225153648-7r5mk20nr9dttqbf
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/https_server.py
75
75
    # Provides usable defaults since an https server requires both a
76
76
    # private key and certificate to work.
77
77
    def __init__(self, request_handler=http_server.TestingHTTPRequestHandler,
 
78
                 protocol_version=None,
78
79
                 key_file=ssl_certs.build_path('server_without_pass.key'),
79
80
                 cert_file=ssl_certs.build_path('server.crt')):
80
 
        http_server.HttpServer.__init__(self, request_handler)
 
81
        http_server.HttpServer.__init__(self, request_handler=request_handler,
 
82
                                        protocol_version=protocol_version)
81
83
        self.key_file = key_file
82
84
        self.cert_file = cert_file
83
85
        self.temp_files = []