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

Updated Request with stup to support default ports

Browse Source
This commit is contained in:
Max Shytikov
2014-05-04 02:06:21 +02:00
parent 5d10a38160
commit 3322234b25
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcr/request.py
View File

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

17
vcr/stubs/__init__.py
View File

@@ -119,21 +119,30 @@ class VCRConnection:
# A reference to the cassette that's currently being patched in # A reference to the cassette that's currently being patched in
cassette = None cassette = None
def _port_postfix(self):
"""
Returns empty string for the default port and ':port' otherwise
"""
port = self.real_connection.port
default_port = {'https': 433, 'http': 80}[self._protocol]
return ':{0}'.format(port) if port != default_port else ''
def _uri(self, url): def _uri(self, url):
"""Returns request absolute URI""" """Returns request absolute URI"""
return "{0}://{1}:{2}{3}".format( uri = "{0}://{1}{2}{3}".format(
self._protocol, self._protocol,
self.real_connection.host, self.real_connection.host,
self.real_connection.port, self._port_postfix(),
url, url,
) )
return uri
def _url(self, uri): def _url(self, uri):
"""Returns request selector url from absolute URI""" """Returns request selector url from absolute URI"""
prefix = "{0}://{1}:{2}".format( prefix = "{0}://{1}{2}".format(
self._protocol, self._protocol,
self.real_connection.host, self.real_connection.host,
self.real_connection.port, self._port_postfix(),
) )
return uri.replace(prefix, '', 1) return uri.replace(prefix, '', 1)