1
0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 01:03:24 +00:00

Fix default port for HTTPS.

This commit is contained in:
Abhinav Gupta
2015-02-23 23:37:04 -08:00
parent 32831d4151
commit 2473bdb77a
4 changed files with 5 additions and 5 deletions

View File

@@ -21,8 +21,8 @@ def test_headers():
('http://go.com/', 80), ('http://go.com/', 80),
('http://go.com:80/', 80), ('http://go.com:80/', 80),
('http://go.com:3000/', 3000), ('http://go.com:3000/', 3000),
('https://go.com/', 433), ('https://go.com/', 443),
('https://go.com:433/', 433), ('https://go.com:443/', 443),
('https://go.com:3000/', 3000), ('https://go.com:3000/', 3000),
]) ])
def test_port(uri, expected_port): def test_port(uri, expected_port):

View File

@@ -58,7 +58,7 @@ PARTS = [
def build_uri(**parts): def build_uri(**parts):
port = parts['port'] port = parts['port']
scheme = parts['protocol'] scheme = parts['protocol']
default_port = {'https': 433, 'http': 80}[scheme] default_port = {'https': 443, 'http': 80}[scheme]
parts['port'] = ':{0}'.format(port) if port != default_port else '' parts['port'] = ':{0}'.format(port) if port != default_port else ''
return "{protocol}://{host}{port}{path}".format(**parts) return "{protocol}://{host}{port}{path}".format(**parts)

View File

@@ -51,7 +51,7 @@ class Request(object):
parse_uri = urlparse(self.uri) parse_uri = urlparse(self.uri)
port = parse_uri.port port = parse_uri.port
if port is None: if port is None:
port = {'https': 433, 'http': 80}[parse_uri.scheme] port = {'https': 443, 'http': 80}[parse_uri.scheme]
return port return port
@property @property

View File

@@ -128,7 +128,7 @@ class VCRConnection(object):
Returns empty string for the default port and ':port' otherwise Returns empty string for the default port and ':port' otherwise
""" """
port = self.real_connection.port port = self.real_connection.port
default_port = {'https': 433, 'http': 80}[self._protocol] default_port = {'https': 443, 'http': 80}[self._protocol]
return ':{0}'.format(port) if port != default_port else '' return ':{0}'.format(port) if port != default_port else ''
def _uri(self, url): def _uri(self, url):