python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2026-06-20 11:32:56 +02:00
Code Activity

'\' only escapes separator characters in req-items

Browse Source 
It makes easier to work with Windows paths.

Closes #253, #254
This commit is contained in:
Jakub Roztocil
2014-09-05 18:33:46 +02:00
parent 1035710956
commit 5084f18568
3 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_cli.py
+33 -20
View File
@@ -18,26 +18,28 @@ from fixtures import (
class TestItemParsing:
key_value_type = KeyValueArgType(*input.SEP_GROUP_ALL_ITEMS)
key_value = KeyValueArgType(*input.SEP_GROUP_ALL_ITEMS)
def test_invalid_items(self):
items = ['no-separator']
for item in items:
pytest.raises(argparse.ArgumentTypeError,
self.key_value_type, item)
pytest.raises(argparse.ArgumentTypeError, self.key_value, item)
def test_escape(self):
def test_escape_separator(self):
items = input.parse_items([
# headers
self.key_value_type(r'foo\:bar:baz'),
self.key_value_type(r'jack\@jill:hill'),
self.key_value(r'foo\:bar:baz'),
self.key_value(r'jack\@jill:hill'),
# data
self.key_value_type(r'baz\=bar=foo'),
self.key_value(r'baz\=bar=foo'),
# files
self.key_value_type(r'bar\@baz@%s' % FILE_PATH_ARG)
self.key_value(r'bar\@baz@%s' % FILE_PATH_ARG),
])
# `requests.structures.CaseInsensitiveDict` => `dict`
headers = dict(items.headers._store.values())
assert headers == {
'foo:bar': 'baz',
'jack@jill': 'hill',
@@ -45,25 +47,36 @@ class TestItemParsing:
assert items.data == {'baz=bar': 'foo'}
assert 'bar@baz' in items.files
@pytest.mark.parametrize(('string', 'key', 'sep', 'value'), [
('path=c:\windows', 'path', '=', 'c:\windows'),
('path=c:\windows\\', 'path', '=', 'c:\windows\\'),
('path\==c:\windows', 'path=', '=', 'c:\windows'),
])
def test_backslash_before_non_special_character_does_not_escape(
self, string, key, sep, value):
expected = KeyValue(orig=string, key=key, sep=sep, value=value)
actual = self.key_value(string)
assert actual == expected
def test_escape_longsep(self):
items = input.parse_items([
self.key_value_type(r'bob\:==foo'),
self.key_value(r'bob\:==foo'),
])
assert items.params == {'bob:': 'foo'}
def test_valid_items(self):
items = input.parse_items([
self.key_value_type('string=value'),
self.key_value_type('header:value'),
self.key_value_type('list:=["a", 1, {}, false]'),
self.key_value_type('obj:={"a": "b"}'),
self.key_value_type('eh:'),
self.key_value_type('ed='),
self.key_value_type('bool:=true'),
self.key_value_type('file@' + FILE_PATH_ARG),
self.key_value_type('query==value'),
self.key_value_type('string-embed=@' + FILE_PATH_ARG),
self.key_value_type('raw-json-embed:=@' + JSON_FILE_PATH_ARG),
self.key_value('string=value'),
self.key_value('header:value'),
self.key_value('list:=["a", 1, {}, false]'),
self.key_value('obj:={"a": "b"}'),
self.key_value('eh:'),
self.key_value('ed='),
self.key_value('bool:=true'),
self.key_value('file@' + FILE_PATH_ARG),
self.key_value('query==value'),
self.key_value('string-embed=@' + FILE_PATH_ARG),
self.key_value('raw-json-embed:=@' + JSON_FILE_PATH_ARG),
])
# Parsed headers