← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/https_server.py

  • Committer: Martin Pool
  • Date: 2009-01-13 03:11:04 UTC
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mbp@sourcefrog.net-20090113031104-03my054s02i9l2pe
Bump version to 1.12 and add news template

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/https_server.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""HTTPS test server, available when ssl python module is available"""
18
18
 
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,
79
78
                 key_file=ssl_certs.build_path('server_without_pass.key'),
80
79
                 cert_file=ssl_certs.build_path('server.crt')):
81
 
        http_server.HttpServer.__init__(self, request_handler=request_handler,
82
 
                                        protocol_version=protocol_version)
 
80
        http_server.HttpServer.__init__(self, request_handler)
83
81
        self.key_file = key_file
84
82
        self.cert_file = cert_file
85
83
        self.temp_files = []