mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Simplify HTTPSConnection constructor.

Browse source 
See discussion in SF bug 458463.
This commit is contained in:
Jeremy Hylton 2002-06-28 23:38:14 +00:00
parent 13f99d7097
commit 7c75c99a10
1 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/httplib.py
View file

@ -78,10 +78,10 @@ except ImportError:
__all__ = ["HTTP", "HTTPResponse", "HTTPConnection", "HTTPSConnection", __all__ = ["HTTP", "HTTPResponse", "HTTPConnection", "HTTPSConnection",
"HTTPException", "NotConnected", "UnknownProtocol", "HTTPException", "NotConnected", "UnknownProtocol",
"UnknownTransferEncoding", "IllegalKeywordArgument", "UnknownTransferEncoding", "UnimplementedFileMode",
"UnimplementedFileMode", "IncompleteRead", "InvalidURL", "IncompleteRead", "InvalidURL", "ImproperConnectionState",
"ImproperConnectionState", "CannotSendRequest", "CannotSendHeader", "CannotSendRequest", "CannotSendHeader", "ResponseNotReady",
"ResponseNotReady", "BadStatusLine", "error"] "BadStatusLine", "error"]
HTTP_PORT = 80 HTTP_PORT = 80
HTTPS_PORT = 443 HTTPS_PORT = 443
@ -733,21 +733,10 @@ class HTTPSConnection(HTTPConnection):
default_port = HTTPS_PORT default_port = HTTPS_PORT
def __init__(self, host, port=None, **x509): def __init__(self, host, port=None, key_file=None, cert_file=None):
keys = x509.keys()
try:
keys.remove('key_file')
except ValueError:
pass
try:
keys.remove('cert_file')
except ValueError:
pass
if keys:
raise IllegalKeywordArgument()
HTTPConnection.__init__(self, host, port) HTTPConnection.__init__(self, host, port)
self.key_file = x509.get('key_file') self.key_file = key_file
self.cert_file = x509.get('cert_file') self.cert_file = cert_file
def connect(self): def connect(self):
"Connect to a host on a given (SSL) port." "Connect to a host on a given (SSL) port."
@ -891,9 +880,6 @@ class UnknownProtocol(HTTPException):
class UnknownTransferEncoding(HTTPException): class UnknownTransferEncoding(HTTPException):
pass pass
class IllegalKeywordArgument(HTTPException):
pass
class UnimplementedFileMode(HTTPException): class UnimplementedFileMode(HTTPException):
pass pass