python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-02-15 13:33:39 +02:00
Code

Improved request formatting.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-03-14 19:30:58 +01:00
parent ccbea8c96e
commit e2e749b2a6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
httpie/__main__.py
View File

@ -39,9 +39,9 @@ def format_http_message(message, prettifier=None,
else: else:
bits.append(message.line) bits.append(message.line)
bits.append(message.headers) bits.append(message.headers)
if with_body: if with_body and message.body:
bits.append('\n') bits.append('\n')
if with_body: if with_body and message.body:
if prettifier and message.content_type: if prettifier and message.content_type:
bits.append(prettifier.body(message.body, message.content_type)) bits.append(prettifier.body(message.body, message.content_type))
else: else:

9
httpie/pretty.py
View File

@ -26,9 +26,14 @@ class HTTPLexer(RegexLexer):
tokens = { tokens = {
'root': [ 'root': [
(r'\s+', token.Text), (r'\s+', token.Text),
# Request-Line
(r'([A-Z]+\s+)(/.*?)(\s+HTTP/[\d.]+)', bygroups(
token.Keyword, token.String, token.Keyword)),
# Status-Line
(r'(HTTP/[\d.]+\s+)(\d+)(\s+.+)', bygroups( (r'(HTTP/[\d.]+\s+)(\d+)(\s+.+)', bygroups(
token.Operator, token.Number, token.String)), token.Keyword, token.Number, token.String)),
(r'(.*?:)(.+)', bygroups(token.Name, token.String)) # Header
(r'(.*?:)(.+)', bygroups(token.Name, token.Keyword))
]} ]}