Skip to content

Add arg to not sort header keys for more accurate ordering #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add arg to not sort header keys for more accurate ordering #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions uncurl/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def parse_context(curl_command):
)


def parse(curl_command, **kargs):
def parse(curl_command, sort_keys=True, **kargs):
parsed_context = parse_context(curl_command)

data_token = ''
Expand All @@ -74,13 +74,15 @@ def parse(curl_command, **kargs):
requests_kargs=''
for k,v in sorted(kargs.items()):
requests_kargs += "{}{}={},\n".format(BASE_INDENT,k,str(v))

formatter = {
'method': parsed_context.method,
'url': parsed_context.url,
'data_token': data_token,
'headers_token': "{}headers={}".format(BASE_INDENT, dict_to_pretty_string(parsed_context.headers)),
'cookies_token': "{}cookies={}".format(BASE_INDENT, dict_to_pretty_string(parsed_context.cookies)),
'headers_token': "{}headers={}".format(BASE_INDENT,
dict_to_pretty_string(parsed_context.headers, sort_keys=sort_keys)),
'cookies_token': "{}cookies={}".format(BASE_INDENT,
dict_to_pretty_string(parsed_context.cookies, sort_keys=sort_keys)),
'security_token': verify_token,
'requests_kargs': requests_kargs
}
Expand All @@ -90,9 +92,9 @@ def parse(curl_command, **kargs):
{cookies_token},{security_token}
)""".format(**formatter)

def dict_to_pretty_string(the_dict, indent=4):
def dict_to_pretty_string(the_dict, indent=4, sort_keys=True):
if not the_dict:
return "{}"

return ("\n" + " " * indent).join(
json.dumps(the_dict, sort_keys=True, indent=indent, separators=(',', ': ')).splitlines())
json.dumps(the_dict, sort_keys=sort_keys, indent=indent, separators=(',', ': ')).splitlines())