Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ coverage==5.5
mock
nose
six
pyperclip
sure<1.2.4
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
from setuptools import setup, find_packages

setup(
name='uncurl',
version='0.0.11',
description='A library to convert curl requests to python-requests.',
author='Steve Pulec',
author_email='spulec@gmail.com',
url='https://github.com/spulec/uncurl',
name='uncurl-pk',
version='0.0.4',
description='A library to convert curl requests to python-requests. Forked version of spulec/uncurl ',
author='Pankaj Kumar',
author_email='pnkjpvt@gmail.com',
url='https://github.com/pnkjkpvt/uncurl/tree/master',
entry_points={
'console_scripts': [
'uncurl = uncurl.bin:main',
Expand Down
24 changes: 15 additions & 9 deletions uncurl/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,25 @@

from six.moves import http_cookies as Cookie

parser = argparse.ArgumentParser()

class ModifiedArgumentParser(argparse.ArgumentParser):
# @override
def error(self, message):
raise ValueError(message)


parser = ModifiedArgumentParser()
parser.add_argument('command')
parser.add_argument('url')
parser.add_argument('-d', '--data')
parser.add_argument('-b', '--data-binary', '--data-raw', default=None)
parser.add_argument('-X', default='')
parser.add_argument('-H', '--header', action='append', default=[])
parser.add_argument('--compressed', action='store_true')
parser.add_argument('-k','--insecure', action='store_true')
parser.add_argument('-k', '--insecure', action='store_true')
parser.add_argument('--user', '-u', default=())
parser.add_argument('-i','--include', action='store_true')
parser.add_argument('-s','--silent', action='store_true')
parser.add_argument('-i', '--include', action='store_true')
parser.add_argument('-s', '--silent', action='store_true')
parser.add_argument('-x', '--proxy', default={})
parser.add_argument('-U', '--proxy-user', default='')

Expand Down Expand Up @@ -103,12 +110,12 @@ def parse(curl_command, **kargs):
if parsed_context.verify:
verify_token = '\n{}verify=False'.format(BASE_INDENT)

requests_kargs=''
for k,v in sorted(kargs.items()):
requests_kargs += "{}{}={},\n".format(BASE_INDENT,k,str(v))
requests_kargs = ''
for k, v in sorted(kargs.items()):
requests_kargs += "{}{}={},\n".format(BASE_INDENT, k, str(v))

#auth_data = f'{BASE_INDENT}auth={parsed_context.auth}'
auth_data = "{}auth={}".format(BASE_INDENT,parsed_context.auth)
auth_data = "{}auth={}".format(BASE_INDENT, parsed_context.auth)
proxy_data = "\n{}proxies={}".format(BASE_INDENT, parsed_context.proxy)

formatter = {
Expand Down Expand Up @@ -136,4 +143,3 @@ def dict_to_pretty_string(the_dict, indent=4):

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