mirror of
https://github.com/kevin1024/vcrpy.git
synced 2025-12-09 01:03:24 +00:00
Updated migration to support default ports
This commit is contained in:
@@ -38,7 +38,11 @@ PARTS = [
|
|||||||
|
|
||||||
|
|
||||||
def build_uri(**parts):
|
def build_uri(**parts):
|
||||||
return "{protocol}://{host}:{port}{path}".format(**parts)
|
port = parts['port']
|
||||||
|
scheme = parts['protocol']
|
||||||
|
default_port = {'https': 433, 'http': 80}[scheme]
|
||||||
|
parts['port'] = ':{0}'.format(port) if port != default_port else ''
|
||||||
|
return "{protocol}://{host}{port}{path}".format(**parts)
|
||||||
|
|
||||||
|
|
||||||
def migrate_json(in_fp, out_fp):
|
def migrate_json(in_fp, out_fp):
|
||||||
@@ -84,11 +88,11 @@ def migrate_yml(in_fp, out_fp):
|
|||||||
if not isinstance(req, request.Request):
|
if not isinstance(req, request.Request):
|
||||||
raise Exception("already migrated")
|
raise Exception("already migrated")
|
||||||
else:
|
else:
|
||||||
req.uri = "{0}://{1}:{2}{3}".format(
|
req.uri = build_uri(
|
||||||
req.__dict__['protocol'],
|
protocol=req.__dict__['protocol'],
|
||||||
req.__dict__['host'],
|
host=req.__dict__['host'],
|
||||||
req.__dict__['port'],
|
port=req.__dict__['port'],
|
||||||
req.__dict__['path'],
|
path=req.__dict__['path'],
|
||||||
)
|
)
|
||||||
|
|
||||||
# convert headers to dict of lists
|
# convert headers to dict of lists
|
||||||
|
|||||||
Reference in New Issue
Block a user