extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2025-06-27 13:01:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jakub Roztocil 2014-01-25 15:07:22 +01:00
parent 52dd6adaa3
commit e0cc63c7eb
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -302,7 +302,7 @@ their type is distinguished only by the separator used:
| | The ``==`` separator is used | | | The ``==`` separator is used |
+-----------------------+-----------------------------------------------------+ +-----------------------+-----------------------------------------------------+
| Data Fields | Request data fields to be serialized as a JSON | | Data Fields | Request data fields to be serialized as a JSON |
| ``field=value``, | object (default), or to be form encoded | | ``field=value``, | object (default), or to be form-encoded |
| ``field=@file.txt`` | (``--form, -f``). | | ``field=@file.txt`` | (``--form, -f``). |
+-----------------------+-----------------------------------------------------+ +-----------------------+-----------------------------------------------------+
| Raw JSON fields | Useful when sending JSON and one or | | Raw JSON fields | Useful when sending JSON and one or |

2
httpie/cli.py
View File

@ -97,7 +97,7 @@ positional.add_argument(
) )
positional.add_argument( positional.add_argument(
'items', 'items',
metavar='REQUEST ITEM', metavar='REQUEST_ITEM',
nargs=ZERO_OR_MORE, nargs=ZERO_OR_MORE,
type=KeyValueArgType(*SEP_GROUP_ALL_ITEMS), type=KeyValueArgType(*SEP_GROUP_ALL_ITEMS),
help=r""" help=r"""

20
tests/tests.py
View File

@ -1265,6 +1265,7 @@ class ItemParsingTest(BaseTestCase):
self.assertEqual(files['file'][1].read().strip().decode('utf8'), self.assertEqual(files['file'][1].read().strip().decode('utf8'),
FILE_CONTENT) FILE_CONTENT)
class CLIParserTestCase(unittest.TestCase): class CLIParserTestCase(unittest.TestCase):
def test_expand_localhost_shorthand(self): def test_expand_localhost_shorthand(self):
@ -1277,7 +1278,7 @@ class CLIParserTestCase(unittest.TestCase):
self.assertEqual(args.url, 'http://localhost/') self.assertEqual(args.url, 'http://localhost/')
def test_expand_locahost_shorthand_with_port(self): def test_expand_localhost_shorthand_with_port(self):
args = parser.parse_args(args=[':3000'], env=TestEnvironment()) args = parser.parse_args(args=[':3000'], env=TestEnvironment())
self.assertEqual(args.url, 'http://localhost:3000') self.assertEqual(args.url, 'http://localhost:3000')
@ -1303,14 +1304,23 @@ class CLIParserTestCase(unittest.TestCase):
self.assertEqual(args.url, 'http://::1') self.assertEqual(args.url, 'http://::1')
def test_dont_expand_longer_ipv6_as_shorthand(self): def test_dont_expand_longer_ipv6_as_shorthand(self):
args = parser.parse_args(args=['::ffff:c000:0280'], env=TestEnvironment()) args = parser.parse_args(
args=['::ffff:c000:0280'],
env=TestEnvironment()
)
self.assertEqual(args.url, 'http://::ffff:c000:0280') self.assertEqual(args.url, 'http://::ffff:c000:0280')
def test_dont_expand_full_ipv6_as_shorthand(self): def test_dont_expand_full_ipv6_as_shorthand(self):
args = parser.parse_args(args=['0000:0000:0000:0000:0000:0000:0000:0001'], env=TestEnvironment()) args = parser.parse_args(
args=['0000:0000:0000:0000:0000:0000:0000:0001'],
env=TestEnvironment()
)
self.assertEqual(
args.url,
'http://0000:0000:0000:0000:0000:0000:0000:0001'
)
self.assertEqual(args.url, 'http://0000:0000:0000:0000:0000:0000:0000:0001')
class ArgumentParserTestCase(unittest.TestCase): class ArgumentParserTestCase(unittest.TestCase):