extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2024-11-22 07:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

use constants

Browse Source
This commit is contained in:
Batuhan Taskaya 2022-01-13 19:45:16 +03:00
parent fb82f44cd1
commit dc30919893
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpie/cli/constants.py
View File

@ -125,3 +125,9 @@ class RequestType(enum.Enum):
FORM = enum.auto() FORM = enum.auto()
MULTIPART = enum.auto() MULTIPART = enum.auto()
JSON = enum.auto() JSON = enum.auto()
OPEN_BRACKET = '['
CLOSE_BRACKET = ']'
BACKSLASH = '\\'
HIGHLIGHTER = '^'

17
httpie/cli/nested_json.py
View File

@ -9,6 +9,7 @@ from typing import (
Type, Type,
Union, Union,
) )
from httpie.cli.constants import OPEN_BRACKET, CLOSE_BRACKET, BACKSLASH, HIGHLIGHTER
class HTTPieSyntaxError(ValueError): class HTTPieSyntaxError(ValueError):
@ -30,7 +31,7 @@ class HTTPieSyntaxError(ValueError):
lines.append(self.source) lines.append(self.source)
lines.append( lines.append(
' ' * (self.token.start) ' ' * (self.token.start)
+ '^' * (self.token.end - self.token.start) + HIGHLIGHTER * (self.token.end - self.token.start)
) )
return '\n'.join(lines) return '\n'.join(lines)
@ -49,8 +50,8 @@ class TokenKind(Enum):
return 'a ' + self.name.lower() return 'a ' + self.name.lower()
OPERATORS = {'[': TokenKind.LEFT_BRACKET, ']': TokenKind.RIGHT_BRACKET} OPERATORS = {OPEN_BRACKET: TokenKind.LEFT_BRACKET, CLOSE_BRACKET: TokenKind.RIGHT_BRACKET}
SPECIAL_CHARS = OPERATORS.keys() | {'\\'} SPECIAL_CHARS = OPERATORS.keys() | {BACKSLASH}
class Token(NamedTuple): class Token(NamedTuple):
@ -65,7 +66,7 @@ def assert_cant_happen() -> NoReturn:
def check_escaped_int(value: str) -> str: def check_escaped_int(value: str) -> str:
if not value.startswith('\\'): if not value.startswith(BACKSLASH):
raise ValueError('Not an escaped int') raise ValueError('Not an escaped int')
try: try:
@ -114,7 +115,7 @@ def tokenize(source: str) -> Iterator[Token]:
if index in OPERATORS: if index in OPERATORS:
yield from send_buffer() yield from send_buffer()
yield Token(OPERATORS[index], index, cursor, cursor + 1) yield Token(OPERATORS[index], index, cursor, cursor + 1)
elif index == '\\' and can_advance(): elif index == BACKSLASH and can_advance():
if source[cursor + 1] in SPECIAL_CHARS: if source[cursor + 1] in SPECIAL_CHARS:
backslashes += 1 backslashes += 1
else: else:
@ -159,11 +160,11 @@ class Path:
if self.kind is PathAction.KEY: if self.kind is PathAction.KEY:
if self.is_root: if self.is_root:
return str(self.accessor) return str(self.accessor)
return '[' + self.accessor + ']' return OPEN_BRACKET + self.accessor + CLOSE_BRACKET
elif self.kind is PathAction.INDEX: elif self.kind is PathAction.INDEX:
return '[' + str(self.accessor) + ']' return OPEN_BRACKET + str(self.accessor) + CLOSE_BRACKET
elif self.kind is PathAction.APPEND: elif self.kind is PathAction.APPEND:
return '[]' return OPEN_BRACKET + CLOSE_BRACKET
else: else:
assert_cant_happen() assert_cant_happen()