x
/
tobiko
Code Issues Proposed changes

Update curl.execute_curl function 

Change-Id: If43ee5fbdd34a366f9b8ab907e469b0a8d17ae9b
This commit is contained in:
Federico Ressi 2021-10-13 07:38:51 +02:00
parent 89aee760c7
commit f353024967
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tobiko/shell/curl/_execute.py
View File

@ -33,14 +33,14 @@ CURL_CONNECTION_ERRORS = {
def execute_curl( def execute_curl(
hostname: typing.Union[str, netaddr.IPAddress, None] = None, hostname: typing.Union[str, netaddr.IPAddress] = None,
port: typing.Optional[int] = None, port: int = None,
path: typing.Optional[str] = None, path: str = None,
scheme: typing.Optional[str] = None, scheme: str = None,
ssh_client: typing.Optional[ssh.SSHClientFixture] = None, ssh_client: ssh.SSHClientType = None,
connect_timeout: tobiko.Seconds = None, connect_timeout: tobiko.Seconds = None,
fail_silently: bool = True, fail_silently: bool = True,
retry_count: typing.Optional[int] = None, retry_count: int = None,
retry_timeout: tobiko.Seconds = None, retry_timeout: tobiko.Seconds = None,
retry_interval: tobiko.Seconds = None, retry_interval: tobiko.Seconds = None,
**execute_params) -> str: **execute_params) -> str:
@ -85,7 +85,8 @@ def make_netloc(
try: try:
ip_address = netaddr.IPAddress(hostname) ip_address = netaddr.IPAddress(hostname)
except netaddr.AddrFormatError: except netaddr.AddrFormatError:
netloc = str(hostname).lower() tobiko.check_valid_type(hostname, str)
netloc = hostname
else: else:
if ip_address.version == 6: if ip_address.version == 6:
# Add square brackets around IPv6 address to please curl # Add square brackets around IPv6 address to please curl
@ -105,7 +106,7 @@ def make_netloc(
def make_url(scheme: typing.Optional[str] = None, def make_url(scheme: typing.Optional[str] = None,
netloc: typing.Optional[str] = None, netloc: typing.Optional[str] = None,
path: typing.Optional[str] = None) -> str: path: typing.Optional[str] = None) -> str:
return parse.SplitResult(scheme=scheme or '', return parse.SplitResult(scheme=(scheme or 'http').lower(),
netloc=netloc or '', netloc=netloc or '',
path=path or '', path=path or '',
query='', query='',