python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-07-17 01:42:46 +02:00
Code Activity

Added ability to escape parameters... except for the := ones.

Browse Source
This commit is contained in:
Jake Basile
2012-04-16 20:28:08 -05:00
parent 6db93b25d8
commit c29981c633
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
httpie/cli.py
View File

@ -1,6 +1,7 @@
import os
import json
import argparse
import re
from collections import namedtuple
from . import pretty
from . import __doc__ as doc
@ -31,6 +32,19 @@ class ParseError(Exception):
KeyValue = namedtuple('KeyValue', ['key', 'value', 'sep', 'orig'])
def find_separator(string, sep, depth = 1):
for i in range(depth):
loc = string.find(sep)
if loc != -1:
# check if previous char is escape char
possible_escape = loc - 1
if possible_escape <= 0 or string[possible_escape] != '\\':
return loc
else:
# remove the escape char
string = string.replace('\\' + sep, sep, 1)
return find_separator(string, sep, depth + 1)
class KeyValueType(object):
"""A type used with `argparse`."""
@ -38,16 +52,28 @@ class KeyValueType(object):
self.separators = separators
def __call__(self, string):
found = dict((string.find(sep), sep)
for sep in self.separators
if string.find(sep) != -1)
found = {}
for sep in self.separators:
regex = '[^\\\\]' + sep
match = re.search(regex, string)
if match:
found[match.start() + 1] = sep
if not found:
#noinspection PyExceptionInherit
raise argparse.ArgumentTypeError(
'"%s" is not a valid value' % string)
sep = found[min(found.keys())]
key, value = string.split(sep, 1)
# split the string at the earliest non-escaped separator.
seploc = min(found.keys())
sep = found[seploc]
key = string[:seploc]
value = string[seploc + len(sep):]
# remove escape chars
for sepstr in self.separators:
key = key.replace('\\' + sepstr, sepstr)
value = value.replace('\\' + sepstr, sepstr)
return KeyValue(key=key, value=value, sep=sep, orig=string)