python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-01-10 00:28:12 +02:00
Code

Improved --check-status + HTTP error + stdout redirect warning.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-12-05 05:27:11 +01:00
parent 53caf6ae72
commit f2d59ba6bd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httpie/core.py
View File

@ -60,9 +60,10 @@ def main(args=sys.argv[1:], env=Environment()):
if env.config.default_options:
args = env.config.default_options + args
def error(msg, *args):
def error(msg, *args, **kwargs):
msg = msg % args
env.stderr.write('\nhttp: error: %s\n' % msg)
level = kwargs.get('level', 'error')
env.stderr.write('http: %s: %s\n' % (level, msg))
debug = '--debug' in args
traceback = debug or '--traceback' in args
@ -81,8 +82,12 @@ def main(args=sys.argv[1:], env=Environment()):
if args.check_status:
exit_status_code = get_exist_status_code(response.status_code,
args.follow)
if exit_status_code != ExitStatus.OK and not env.stdout_isatty:
error('%s %s', response.raw.status, response.raw.reason)
if not env.stdout_isatty and exit_status_code != ExitStatus.OK:
error('HTTP %s %s',
response.raw.status,
response.raw.reason,
level='warning')
write_kwargs = {
'stream': build_output_stream(