python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2024-11-24 08:22:22 +02:00
Code

Added forcing pretty printing for piping purposes.

Browse Source
This commit is contained in:
Praful Mathur 2012-03-02 16:54:18 -05:00
parent 860a851a4b
commit 84a0d4a35d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpie/httpie.py
View File

@ -70,7 +70,8 @@ parser.add_argument('--style', '-s', dest='style', default='solarized', metavar=
choices=pretty.AVAILABLE_STYLES, choices=pretty.AVAILABLE_STYLES,
help='Output coloring style, one of %s. Defaults to solarized.' help='Output coloring style, one of %s. Defaults to solarized.'
% ', '.join(sorted(pretty.AVAILABLE_STYLES))) % ', '.join(sorted(pretty.AVAILABLE_STYLES)))
parser.add_argument('--pretty', '-p', help='Force pretty print.',
dest='force_pretty', action='store_false', default=False)
# ``requests.request`` keyword arguments. # ``requests.request`` keyword arguments.
parser.add_argument('--auth', '-a', help='username:password', parser.add_argument('--auth', '-a', help='username:password',
@ -113,6 +114,7 @@ def main(args=None,
stdout_isatty=sys.stdout.isatty()): stdout_isatty=sys.stdout.isatty()):
args = parser.parse_args(args if args is not None else sys.argv[1:]) args = parser.parse_args(args if args is not None else sys.argv[1:])
is_pretty = args.force_pretty or stdout_isatty
# Parse request headers and data from the command line. # Parse request headers and data from the command line.
headers = CaseInsensitiveDict() headers = CaseInsensitiveDict()
@ -174,7 +176,7 @@ def main(args=None,
response.content.decode(encoding) if response.content else u'' response.content.decode(encoding) if response.content else u''
) )
if args.prettify and stdout_isatty: if args.prettify and is_pretty:
prettify = pretty.PrettyHttp(args.style) prettify = pretty.PrettyHttp(args.style)
if args.print_headers: if args.print_headers:
status_line = prettify.headers(status_line).strip() status_line = prettify.headers(status_line).strip()