x
/
os-http
Code Issues Proposed changes

Improve formatting without a tty 

Using console formatting when you pipe to a file produces bad output.
Format for text when there is not tty device.
This commit is contained in:
Jamie Lennox 2016-04-11 14:01:37 +10:00
parent ecd19d97df
commit c3b549982b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os_http/shell.py
View File

@ -135,7 +135,7 @@ def main():
# I can see no way to get the HTTP version
headers = ["HTTP/1.1 %d %s" % (resp.status_code, resp.reason)]
headers.extend('%s: %s' % k for k in resp.headers.items())
headers = '\r\n'.join(headers)
headers = '\n'.join(headers)
if 'json' in resp.headers.get('Content-Type', '').lower():
body = json.dumps(resp.json(), sort_keys=True, indent=4)
@ -145,7 +145,9 @@ def main():
if pygments:
mime = resp.headers.get('Content-Type')
http_lexer = pygments.lexers.get_lexer_by_name('http')
formatter = pygments.formatters.get_formatter_by_name('console')
formatter_name = 'console' if sys.stdout.isatty() else 'text'
formatter = pygments.formatters.get_formatter_by_name(formatter_name)
try:
body_lexer = pygments.lexers.get_lexer_for_mimetype(mime)
@ -156,4 +158,5 @@ def main():
body = pygments.highlight(body, body_lexer, formatter)
print(headers)
print('')
print(body)