diff --git a/httpie/cliparse.py b/httpie/cliparse.py index 8664edb4..c481fe3c 100644 --- a/httpie/cliparse.py +++ b/httpie/cliparse.py @@ -3,15 +3,19 @@ CLI argument parsing logic. """ import os -import json import re +import json +import argparse + from collections import namedtuple + try: from collections import OrderedDict except ImportError: OrderedDict = dict -import argparse + from requests.structures import CaseInsensitiveDict + from . import __version__ diff --git a/httpie/pretty.py b/httpie/pretty.py index deb82bb3..8c6bdbee 100644 --- a/httpie/pretty.py +++ b/httpie/pretty.py @@ -4,10 +4,10 @@ import json import pygments from pygments.util import ClassNotFound +from pygments.styles import get_style_by_name, STYLE_MAP from pygments.lexers import get_lexer_for_mimetype, HttpLexer from pygments.formatters.terminal256 import Terminal256Formatter from pygments.formatters.terminal import TerminalFormatter -from pygments.styles import get_style_by_name, STYLE_MAP from . import solarized diff --git a/httpie/solarized.py b/httpie/solarized.py index 903f32b6..69bee7da 100644 --- a/httpie/solarized.py +++ b/httpie/solarized.py @@ -27,7 +27,8 @@ THE SOFTWARE. """ from pygments.style import Style -from pygments.token import Token, Comment, Name, Keyword, Generic, Number, Operator, String +from pygments.token import (Token, Comment, Name, Keyword, Generic, Number, + Operator, String) BASE03 = '#002B36'