Commit Graph

785 Commits

Author SHA1 Message Date
Jakub Roztocil
25b1be7c8a Work around missing object_pairs_hook in Python 2.6 2015-01-23 22:04:42 +01:00
Jakub Roztocil
22c993bab8 Merge branch 'fix-268' of https://github.com/asnelzin/httpie into asnelzin-fix-268 2015-01-23 21:45:09 +01:00
Jakub Roztocil
b2ec4f797f Exit with 0 for --version and --help (closes #293). 2015-01-19 15:39:46 +01:00
Alexander Nelzin
a2b12f75ea Fixed and added test for JSON properties order. 2014-11-13 23:56:05 +03:00
Jakub Roztocil
0481957715 Fixed multiple uploads with the same field name
Closes #267
2014-10-20 14:41:48 +02:00
Jakub Roztocil
c301305a59 Cleanup. 2014-10-20 14:41:48 +02:00
Jakub Roztocil
2078ece95a Cleanup 2014-10-20 14:41:48 +02:00
Jakub Roztočil
43f7b84a1e Merge pull request #260 from brakhane/master
Fallback to JSON highlighting if subtype contains json
2014-09-25 06:27:17 +02:00
Dennis Brakhane
f1cd289d51 Fallback to JSON highlighting if subtype contains json
Some JSON based formats like JSON Home Documents[1] don't
use a '+json' suffix, but simply contain json in their
MIME type. Also, some servers might use (outdated)
types like 'application/x-json'.

The JSON formatter can already handle those cases,
but the highlighter was ignoring them.

This commit will let the highlighter choose the JSON
lexer if no other lexer could be found and the MIME subtype
contains 'json'

[1] http://tools.ietf.org/html/draft-nottingham-json-home-03
2014-09-25 00:10:06 +02:00
Jakub Roztocil
24f46ff3ef Changelog 2014-09-08 07:50:41 +02:00
Jakub Roztocil
afe521ef73 Merge remote-tracking branch 'origin/master' 2014-09-08 07:47:55 +02:00
Jakub Roztocil
58b51a8277 Improved terminal color depth detection via curses
Closes #244
2014-09-08 07:46:53 +02:00
Jakub Roztocil
6aa711c69f Removed pytest-xdist
The test suite is much less IO-bound now with the local httpbin
instance (via pytest-httpbin). Therefore, paralelization is not
as helpful.
2014-09-08 07:44:25 +02:00
Jakub Roztočil
d2d1023921 Merge pull request #249 from frewsxcv/patch-1
Enable testing on PyPy 3
2014-09-07 10:45:29 +02:00
Jakub Roztocil
b0effe07d9 Fixed --output=/dev/null on Linux
Closes #252
2014-09-07 10:22:21 +02:00
Jakub Roztocil
af873effb6 Changelog typo. 2014-09-05 18:40:28 +02:00
Jakub Roztocil
5084f18568 '\' only escapes separator characters in req-items
It makes easier to work with Windows paths.

Closes #253, #254
2014-09-05 18:36:23 +02:00
Jakub Roztocil
1035710956 Added RequestItems named tuple for convenience. 2014-09-05 07:51:35 +02:00
Corey Farwell
5d2b3f5552 Enable testing on PyPy 3 2014-08-15 00:03:27 -07:00
Jakub Roztocil
ca36f1de04 Handle empty passwords in URL credentials
Closes #242
2014-07-18 13:39:47 +02:00
Jakub Roztocil
0f96348fd1 Cleanup 2014-07-18 13:39:47 +02:00
Jakub Roztočil
2fd84ec1da Merge pull request #241 from ametaireau/patch-1
Add the hawk auth plugin
2014-07-17 07:58:08 +02:00
Alexis Metaireau
e3c83fca6f Add the hawk plugin 2014-07-17 00:48:56 +02:00
Jakub Roztocil
529f3bd9b6 Fixed python setup.py test 2014-06-28 19:52:10 +02:00
Jakub Roztocil
2a72ae23d5 Run tests against local httpbin instance via pytest-httpbin. 2014-06-28 16:38:41 +02:00
Jakub Roztocil
79329ed1c6 Mention "brew install httpie --HEAD". 2014-06-28 13:26:48 +02:00
Jakub Roztocil
040d981f00 Fixed custom Host
Closes #235
2014-06-28 13:24:14 +02:00
Jakub Roztocil
8c892edd4f PEP8 2014-06-28 13:09:04 +02:00
Jakub Roztočil
a02a1eb562 Fixed README formatting 2014-06-24 17:27:01 +02:00
Jakub Roztočil
5e556612d9 Added $ brew install httpie to README
https://twitter.com/jakubroztocil/status/481453834024550400

Thanks @insomniacslk!
2014-06-24 17:25:29 +02:00
Jakub Roztočil
f5904d92c3 Merge pull request #225 from rockymeza/docs_grep_fix
Fixed the order of args to grep in README.
2014-06-15 16:35:19 +02:00
Rocky Meza
541c75ed5c Fixed the order of args to grep in README. 2014-06-15 08:14:37 -06:00
Jakub Roztocil
8e170b059c Fixed tests. 2014-06-03 19:45:57 +02:00
Jakub Roztočil
b44bc0928f Merge pull request #222 from felixbuenemann/patch-1
Add info about SNI on Python 2.x to README
2014-05-26 15:37:11 +02:00
Felix Bünemann
f283de6968 Add info about SNI on Python 2.x to README
This updates the HTTPS section of the README with instructions on how to get SNI working on Python 2.x.
2014-05-26 15:31:16 +02:00
Jakub Roztocil
77955c9837 Fixed --timeout
* Require requests >= 2.3.0
* Updated test_timeout_exit_status

Close #185.
2014-05-17 22:33:16 +02:00
Jakub Roztočil
4449da456a Merge pull request #220 from frewsxcv/patch-1
Add supported, relevant Python version classifers
2014-05-14 14:24:30 +02:00
Jakub Roztocil
f9b5b3a65d Added OSX to Travis CI config. 2014-05-14 14:00:26 +02:00
Corey Farwell
10f7fc163b Add supported, relevant Python version classifers 2014-05-12 17:36:09 -07:00
Jakub Roztocil
5743363ac9 Merge branch 'master' of github.com:jkbr/httpie 2014-05-12 19:16:15 +02:00
Corey Farwell
7036ec69ff Enable testing on Python 3.4 2014-05-12 19:16:04 +02:00
Jakub Roztočil
02c66e14df Update CONTRIBUTING.rst 2014-05-12 19:16:04 +02:00
Jakub Roztočil
ea8132b3d6 Update CONTRIBUTING.rst 2014-05-12 19:16:04 +02:00
Jakub Roztocil
e4c68063b9 Converted built-in formatters to formatter plugins.
Still work in progress and the API should be considered private for now.
2014-05-12 19:12:39 +02:00
Jakub Roztočil
9c2207844e Merge pull request #219 from frewsxcv/patch-1
Enable testing on Python 3.4
2014-05-12 08:02:17 +02:00
Corey Farwell
b51775bb06 Enable testing on Python 3.4 2014-05-11 20:09:47 -07:00
Jakub Roztočil
f26272f83f Update CONTRIBUTING.rst 2014-05-09 12:48:34 +01:00
Jakub Roztočil
81518f9315 Update CONTRIBUTING.rst 2014-05-09 12:46:33 +01:00
Jakub Roztocil
858555abb5 Make sure session and default headers play nice
Before: headers = default + args + session
Now:    headers = default + session + args

Fixes #180
2014-05-08 12:27:50 +01:00
Jakub Roztocil
3e1b62fb20 Fixed .rst syntax. 2014-05-05 21:17:41 +02:00