Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jakubroztocil/httpie
base: 0.7.1
...
head fork: jakubroztocil/httpie
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Sep 24, 2013
@jakubroztocil Allow embeding text (=@) and JSON (:=@) files content into request da…
…ta fields.
d5bc564
@jakubroztocil Fixed a bytes/str issue for Python 3. 0bcd4d2
@jakubroztocil Fixed password prompt. 2e535d8
Commits on Sep 25, 2013
@jakubroztocil Update --proxy examples to include URLs to work with Requests v2.0.0.. 81c9988
Commits on Oct 09, 2013
@nlf nlf allow :port style shorthand 711168a
@nlf nlf make shorthand parsing more robust, add unit tests and documentation 8a52bef
@nlf nlf tweak readme to show http requests 70eb97d
@nlf nlf tweak readme more 2c12fd9
@nlf nlf tweak readme more 9034546
@nlf nlf add self to authors, update changelog, and mention shorthand in --hel…
…p output
4fe3deb
@jakubroztocil Merge pull request #171 from nlf/master
Allow :port style shorthand for localhost.
817165f
@jakubroztocil Added a link to the httpie-negotiate auth plugin by @ndzou. 927acc2
@jakubroztocil Added a link to the httpie-negotiate auth plugin by @ndzou II. 0e267d8
Commits on Oct 15, 2013
@unsignedint unsignedint process XML data before pretty-printing to trim whitespace bcdf194
Commits on Oct 16, 2013
@unsignedint unsignedint replace XML processor with ElementTree with custom indentation bee10e5
Commits on Dec 08, 2013
@jakubroztocil Added Bitdeli badge. 6af42b1
Commits on Jan 06, 2014
@solidsnack solidsnack Expunge user:pass@... from Host header.
In verbose mode, the basic auth user and password would show up in colored
output reporting the Host header, as reported in
#169
5a037b2
Commits on Jan 07, 2014
@thomasleveil thomasleveil fix typo a31d552
Commits on Jan 08, 2014
@jakubroztocil Merge pull request #192 from thomasleveil/patch-1
fix typo
7a84163
@jakubroztocil Merge pull request #191 from solidsnack/wip-no-auth-in-host-header
Expunge user:pass@... from Host header.
b1074cc
Commits on Jan 17, 2014
@jakubroztocil Update README.rst 01df344
@jakubroztocil Update README.rst 748a0a4
Commits on Jan 25, 2014
@jakubroztocil Catch UnicodeDecodeError when embedding file via =@ or :=@. 1aa7701
@jakubroztocil Updated README. 52dd6ad
@jakubroztocil Cleanup e0cc63c
@jakubroztocil v0.8.0 f1224da
@jakubroztocil Fixed changelog link. 43cc3e7
Commits on Jan 28, 2014
Matthias Lehmann add support for client SSL certificate and key 14583a2
Commits on Jan 29, 2014
Matthias Lehmann check --ssl-cert and --ssl-key to be files b9d7220
Matthias Lehmann rename existing_file to readable_file_arg and move to input d4363a5
Commits on Feb 05, 2014
Matthias Lehmann rename -ssl-cert and --ssl-key to --cert and --certkey a3aae12
Matthias Lehmann document --cert and --certkey dd7197c
Commits on Feb 12, 2014
Matthias Lehmann added --cert to CHANGELOG and matleh to AUTHORS b3a34ab
@jakubroztocil Merge pull request #197 from matleh/master
add support for client SSL certificate and key
2c885b0
Commits on Feb 18, 2014
@jakubroztocil Fixed ZeroDivisionError in download summary.
Closes #202
b01906a
@jakubroztocil Removed Bitdeli badge. af6bda1
Commits on Mar 04, 2014
@jakubroztocil Updated installation instructions. 29877bc
@jakubroztocil Updated installation instructions. 09810d5
@jakubroztocil Updated installation instructions. c33775e
@jakubroztocil Updated installation instructions. 76ab6e4
Commits on Mar 18, 2014
@jakubroztocil Merge pull request #172 from unsignedint/master
process XML data before pretty-printing to trim whitespace
733771f
Commits on Mar 24, 2014
@insyte insyte Update README.rst a2918d8
Commits on Mar 25, 2014
@jakubroztocil Merge pull request #208 from insyte/master
Update README.rst with pronunciation.
e62620d
Commits on Mar 31, 2014
@jakubroztocil Fixed SessionTest.test_session_read_only. bbbae3a
@jakubroztocil Skip ExitStatusTest.test_timeout_exit_status until timeout gets fixed…
… in requests.
746a189
Commits on Apr 24, 2014
@jakubroztocil Refactored tests into smaller modules. 6071fff
@jakubroztocil Converted all unittest asserts to plain, pytest-powered asserts. b880e99
@jakubroztocil Moved fixture constants to tests.fixtures. 941c0a8
@jakubroztocil Switched to @pytest.mark.skipif. 6f28624
@jakubroztocil Cleanup
XX
3cb124b
@jakubroztocil Finished pytest migration. 3d07994
@jakubroztocil Added CONTRIBUTING.rst. 887f70f
@jakubroztocil Added tests for --debug and --help. bdea7be
@jakubroztocil Added docstrings for utilities in `tests.__init__`. ce2169f
@jakubroztocil More tests. e5d758e
@jakubroztocil Added Python 2.6 compatible OrderedDict
To preserver ordr of headers, parameters, etc.
f02169e
@jakubroztocil Python 3.4 3f8a000
@jakubroztocil Parallelized tests using pytest-xdist. 3f63133
Commits on Apr 25, 2014
@jakubroztocil Travis doesn't support Python 3.4 yet. ea42d32
@jakubroztocil Parametrize test_docs.py. f658d24
@jakubroztocil Removed last dependencies on unittest. All tests are pytest-only. 27faf06
@jakubroztocil Test improvements. af4aa3a
@jakubroztocil Cleanup 492ee39
@jakubroztocil Removed unused import. b10d973
@jakubroztocil Improved auth tests. 3c2de34
@jakubroztocil Improved session tests. 1d987c5
@jakubroztocil Cleanup 3342231
@jakubroztocil Cleanup
631e332
Commits on Apr 26, 2014
@jakubroztocil Added appveyor.yml
0e1b651
@jakubroztocil Updated appveyor.yml
e1348da
@jakubroztocil Updated appveyor.yml
6a86164
@jakubroztocil Updated appveyor.yml
4a0d387
@jakubroztocil Updated appveyor.yml
272e66b
@jakubroztocil Updated appveyor.yml
e2dabbf
@jakubroztocil Updated appveyor.yml
aeccac5
@jakubroztocil Updated appveyor.yml
78c83da
@jakubroztocil Updated appveyor.yml
8fb1e10
@jakubroztocil Updated appveyor.yml
95a0884
@jakubroztocil Updated appveyor.yml
091a8b2
@jakubroztocil Updated appveyor.yml
5c3d24e
@jakubroztocil Don't used pytest-xdist with setup.py test
e3af74d
@jakubroztocil Updated appveyor.yml
5065c4f
@jakubroztocil Run tests in verbose mode.
8158fa8
@jakubroztocil Disabled test_windows_colorized_output
0c45c7c
@jakubroztocil Added windows build status icon to README.
5c29a4e
@jakubroztocil Implemented more robust unicode handling.
* Immediatelly convert all args from `bytes` to `str`.
* Added `Environment.stdin_encoding` and `Environment.stdout_encoding`
* Allow unicode characters in HTTP headers and basic auth credentials
  by encoding them using UTF8 instead of latin1 (#212).
15e62ad
@jakubroztocil Fix Windows branch.
56d33a8
@jakubroztocil Avoid "TypeError: keyword arguments must be strings" on Python 3.3.
282cc45
@jakubroztocil Fix tox config. 8ec32fe
@jakubroztocil Python 3 unicode fixes. 467d126
@jakubroztocil Added unicode characters to json fixture. 77dcd6e
@jakubroztocil More unicode tests. 3478cbd
@jakubroztocil Changelog
e8a1c05
@jakubroztocil Added support and tests for unicode support in sessions.
a3352af
@jakubroztocil Added test_unicode_url_query_arg_item.
84a521a
@jakubroztocil Fixed fixture loading on Windows.
bbc820b
@jakubroztocil Updated Travis icon URL.
609950f
@jakubroztocil Cleanup
0bd218e
@jakubroztocil More unicode.
eca1ffa
@jakubroztocil Fixed and added tests for --verbose with unicode headers.
43bc6d0
@jakubroztocil Fixed tests.
1169a3e
@jakubroztocil Cleanup 87806ac
Commits on Apr 27, 2014
@jakubroztocil Python3.3 Windows CI
bae8519
@jakubroztocil Fix appveyor.yml
411822d
@jakubroztocil Fix appveyor.yml
a95d8bb
@jakubroztocil Fix appveyor.yml III.
7c3f8c0
@jakubroztocil Fix appveyor.yml IV.
d05063f
@jakubroztocil Fix appveyor.yml V.
18f3700
@jakubroztocil Cleanup
c06598a
@jakubroztocil Modularized output, refactoring
Making it ready for output formatting plugin API.
05db75b
@jakubroztocil Debug appveyor
82e16c4
@jakubroztocil Python 3.4 @ appveyor.
c8ae697
@jakubroztocil Debug appveyor
64b9a86
@jakubroztocil Debug appveyor
f67a11c
@jakubroztocil Moved `.directory` from `BaseConfigDict` to `Config`.
Closes #200
bd50a6a
@jakubroztocil Handle HTTP 0.9 in response when formatting version.
Closes #170
0e6875b
@jakubroztocil Travis coveralls.
14763e6
Commits on Apr 28, 2014
@jakubroztocil Cleanup 76ab8b8
@jakubroztocil Improve support for 'type/subtype+suffix' mime types in the colors ou…
…tput formatter.

E.g.:
* application/ld+json
* application/hal+json

Closes #189, #206
faec00f
@jakubroztocil Avoid “__init__.py” files in test directories. 2aa53e4
@jakubroztocil Added wheel support
Should make installation via pip work on OSX Mavericks (#148).

Also added a nifty Makefile.
29a564e
@jakubroztocil Fixed Makefile, added setup.cfg.
5a989b6
Commits on May 05, 2014
@jakubroztocil New URL. d9eca19
@jakubroztocil Fixed .rst syntax.
3e1b62f
Commits on May 08, 2014
@jakubroztocil Make sure session and default headers play nice
Before: headers = default + args + session
Now:    headers = default + session + args

Fixes #180
858555a
Commits on May 09, 2014
@jakubroztocil Update CONTRIBUTING.rst
81518f9
@jakubroztocil Update CONTRIBUTING.rst
f26272f
Commits on May 12, 2014
@frewsxcv frewsxcv Enable testing on Python 3.4 b51775b
@jakubroztocil Merge pull request #219 from frewsxcv/patch-1
Enable testing on Python 3.4
9c22078
@jakubroztocil Converted built-in formatters to formatter plugins.
Still work in progress and the API should be considered private for now.
e4c6806
@jakubroztocil Update CONTRIBUTING.rst ea8132b
@jakubroztocil Update CONTRIBUTING.rst 02c66e1
@frewsxcv frewsxcv Enable testing on Python 3.4 7036ec6
@jakubroztocil Merge branch 'master' of github.com:jkbr/httpie
5743363
Commits on May 13, 2014
@frewsxcv frewsxcv Add supported, relevant Python version classifers 10f7fc1
Commits on May 14, 2014
@jakubroztocil Added OSX to Travis CI config.
f9b5b3a
@jakubroztocil Merge pull request #220 from frewsxcv/patch-1
Add supported, relevant Python version classifers
4449da4
Commits on May 17, 2014
@jakubroztocil Fixed --timeout
* Require requests >= 2.3.0
* Updated test_timeout_exit_status

Close #185.
77955c9
Commits on May 26, 2014
@felixbuenemann felixbuenemann 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.
f283de6
@jakubroztocil Merge pull request #222 from felixbuenemann/patch-1
Add info about SNI on Python 2.x to README
b44bc09
Commits on Jun 03, 2014
@jakubroztocil Fixed tests.
8e170b0
Commits on Jun 15, 2014
@rockymeza rockymeza Fixed the order of args to grep in README. 541c75e
@jakubroztocil Merge pull request #225 from rockymeza/docs_grep_fix
Fixed the order of args to grep in README.
f5904d9
Commits on Jun 24, 2014
@jakubroztocil Added `$ brew install httpie` to README
5e55661
@jakubroztocil Fixed README formatting
a02a1eb
Commits on Jun 28, 2014
@jakubroztocil PEP8 8c892ed
@jakubroztocil Fixed custom Host
Closes #235
040d981
@jakubroztocil Mention "brew install httpie --HEAD".
79329ed
@jakubroztocil Run tests against local httpbin instance via pytest-httpbin.
2a72ae2
@jakubroztocil Fixed `python setup.py test`
529f3bd
Commits on Jul 16, 2014
@ametaireau ametaireau Add the hawk plugin e3c83fc
Commits on Jul 17, 2014
@jakubroztocil Merge pull request #241 from ametaireau/patch-1
Add the hawk auth plugin
2fd84ec
Commits on Jul 18, 2014
@jakubroztocil Cleanup 0f96348
@jakubroztocil Handle empty passwords in URL credentials
Closes #242
ca36f1d
Commits on Aug 15, 2014
@frewsxcv frewsxcv Enable testing on PyPy 3 5d2b3f5
Commits on Sep 05, 2014
@jakubroztocil Added RequestItems named tuple for convenience. 1035710
@jakubroztocil '\' only escapes separator characters in req-items
It makes easier to work with Windows paths.

Closes #253, #254
5084f18
@jakubroztocil Changelog typo.
af873ef
Commits on Sep 07, 2014
@jakubroztocil Fixed --output=/dev/null on Linux
Closes #252
b0effe0
@jakubroztocil Merge pull request #249 from frewsxcv/patch-1
Enable testing on PyPy 3
d2d1023
Commits on Sep 08, 2014
@jakubroztocil 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.
6aa711c
@jakubroztocil Improved terminal color depth detection via curses
Closes #244
58b51a8
@jakubroztocil Merge remote-tracking branch 'origin/master'
afe521e
@jakubroztocil Changelog
24f46ff
Commits on Sep 24, 2014
@brakhane brakhane 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
f1cd289
Commits on Sep 25, 2014
@jakubroztocil Merge pull request #260 from brakhane/master
Fallback to JSON highlighting if subtype contains json
43f7b84
Commits on Oct 20, 2014
@jakubroztocil Cleanup 2078ece
@jakubroztocil Cleanup. c301305
@jakubroztocil Fixed multiple uploads with the same field name
Closes #267
0481957
Commits on Nov 13, 2014
@asnelzin asnelzin Fixed and added test for JSON properties order. a2b12f7
Commits on Jan 19, 2015
@jakubroztocil Exit with 0 for --version and --help (closes #293).
b2ec4f7
Commits on Jan 23, 2015
@jakubroztocil Merge branch 'fix-268' of https://github.com/asnelzin/httpie into asn…
…elzin-fix-268
22c993b
@jakubroztocil Work around missing `object_pairs_hook` in Python 2.6
25b1be7
@jakubroztocil Pypy3 (2.4.0) curses bug workaround.
d3d78af
@jakubroztocil --certkey is now --cert-key df07927
@jakubroztocil Added tests for client as well as server SSL certificate handling.
5fbafc1
@jakubroztocil Added test client SSL certs
12f2d99
@jakubroztocil Extended SSL documentation.
59b6020
@jakubroztocil README
ed64854
Commits on Jan 31, 2015
@jakubroztocil v0.0.9
6c66d91
@jakubroztocil 1.0.0-dev
530d6c5
@jakubroztocil Fixed version link
338d39c
@msabramo msabramo README.rst: suppor => support 17358be
@jakubroztocil Merge pull request #297 from msabramo/patch-1
README.rst: suppor => support
c0f1fb6
@jakubroztocil Added a coveralls badge.
92a4352
Commits on Feb 05, 2015
@jakubroztocil Allow custom URL schemes
Closes #299

See also #276
b125ce5
@jakubroztocil Added support for transport adapter plugins
687a6a7
@jakubroztocil Cleanup
996e314
Commits on Feb 06, 2015
@jakubroztocil Added a link to @pd's httpie-api-auth plugin
0d21ff0
@jakubroztocil Handle HTTP/2 responses
9682f95
Commits on Feb 07, 2015
@jakubroztocil Prevent a circular import issue. a5a83c5
@jakubroztocil HTTP/2 has no minor versions.
3ff0352
@jakubroztocil v0.9.1
753a8d0
@jakubroztocil 1.0.0-dev
a786f17
@jakubroztocil README
337c05f
Commits on Feb 10, 2015
@msabramo msabramo Mark test_session_unicode as xfail
There are known problems with unicode in headers.
See #282
873102d
@msabramo msabramo compat.py: Add pragma no covers
Cuz this is a lot of version-specific stuff and it can be confusing to have different coverage per version, especially with coveralls.
86ebb9b
@jakubroztocil Merge pull request #305 from msabramo/patch-3
Conditionally skip test_session_unicode on Py3k
f1e1299
@jakubroztocil Merge pull request #304 from msabramo/patch-2
compat.py: Add pragma no covers
43915b5
@msabramo msabramo .travis.yml: Only do coveralls on newest python
Testing theory that it has to do with different python version subjobs
completing in different orders and the last one wins.
fbd4464
@jakubroztocil Merge pull request #303 from msabramo/coveralls_only_one
.travis.yml: Only do coveralls on the latest Python version
e6e9439
@msabramo msabramo .travis.yml: sudo false for Docker containers
Enables new Docker container infrastructure.
55fa975
@jakubroztocil Merge pull request #306 from msabramo/patch-4
.travis.yml: sudo false for Docker containers
7487942
Commits on Feb 14, 2015
@jakubroztocil Changed the default JSON `Content-Type` to `application/json`.
6e7e2f2
@jakubroztocil Update README examples with the new default `Accept-Encoding` value u…
…sed by Requests.
596fdc8
@jakubroztocil The default color --style is now "fruity"
It's experimental - please let me know should you dislike this change.

To make Solarized default again, add this to your ~/.config.json:

  "default_options": [
    "--style=solarized"
  ],
419ca85
@jakubroztocil Updated screenshot
07aaefa
@jakubroztocil Default --style to "monokai"
dd0a4ab
@jakubroztocil Temporarily skip SSL tests on PyPy due to #308
985f65e
@jakubroztocil Added a PyPy incompatibility workaround.
bc0d17c
@jakubroztocil README
40d95b6
@jakubroztocil README
42f454e
@jakubroztocil Use shields.io badges
3b3eff0
@jakubroztocil Tweak badge style
2e5d142
Commits on Feb 15, 2015
@jakubroztocil README
5760b78
@jakubroztocil README
868baab
@jakubroztocil Fixed TOC
45784c7
Commits on Feb 16, 2015
@msabramo msabramo tox.ini: Use pytest-httpbin>=0.0.6
This hopefully fixes SSL timeout errors. 

Fixes #308
dd7f1c4
@msabramo msabramo test_ssl.py: Remove skip failures on PyPy
Revert 985f65e which skipped SSL tests that failed on PyPy because @kevin1024 fixed the problem in pytest-httpbin 0.0.6 (commit kevin1024/pytest-httpbin@f38a312)
51c19cf
@msabramo msabramo Print info about request on error
This can help in diagnosing certain issues. For example, if I were
trying to use a "http+unix" URL but I don't have #299, then I'll get the
following:

    [marca@marca-mac2 httpie]$ http http+unix://%2Ftmp%2Fprofilesvc.sock/status/pid

    http: error: ConnectionError: ('Connection aborted.', gaierror(8, 'nodename nor servname provided, or not known'))
    while doing GET request to URL: http://http+unix//%2Ftmp%2Fprofilesvc.sock/status/pid

Having the URL in the error message is super useful here so that I know an
extra `http://` is getting prepended and it's not doing what I expected.
7f8adad
@msabramo msabramo Increase test coverage for error handling f855de1
@jakubroztocil Disable urllib3's "Unverified HTTPS request is being made" warnings
ecc5959
@jakubroztocil Merge pull request #312 from msabramo/patch-5
tox.ini: Use pytest-httpbin>=0.0.6
9e62151
@jakubroztocil Extracted changes from README into a proper CHANGELOG file
Inspired by keepachangelog.com
2e88aa5
@jakubroztocil README fixes
b7fc89a
@jakubroztocil Include AUTHORS.rst in dist; metadata cleanup
fb43759
@jakubroztocil Update requirements-dev.txt
24957e3
Commits on Feb 24, 2015
@jakubroztocil Don't depend on `requests.compat` e4bc363
@jakubroztocil Use absolute links to LICENCE, etc. bada3b4
@jakubroztocil 0.9.2 a228399
@jakubroztocil 1.0.0-dev
1c181a5
@jakubroztocil Clean up `compat` and fix `is_pypy`.
fdae686
@jakubroztocil README
5f3de55
@jakubroztocil Typo fdabbc6
Commits on Feb 28, 2015
@jakubroztocil Fixed --debug output
1a43c0e
Commits on Mar 08, 2015
@fay-jai fay-jai Update license with up-to-date year 798cd4f
Commits on Mar 10, 2015
@ifdattic ifdattic Fix typos, improve readability ece85c0
@jakubroztocil Merge pull request #321 from ifdattic/patch-1
Fix typos, improve readability
35a3dd2
Commits on Mar 13, 2015
@jakubroztocil Added .editorconfig.
ab0d1fd
Commits on Mar 25, 2015
@mihirvj mihirvj See #326
Adds bash completion to http command line interface.

Installing the script:
You can copy it to /etc/bash_completion.d/ (or something else on your
machine) and source it using following command

	$ source /etc/profile

Now whenever you encounter a "-*" on your CLI, it presents you with the
options specified.

Couple of things that are still under work:
1) Adding this bash script to setup, so that user won't need manual
installation
2) Adding more options for HTTP (GET, PUT and so on) and other
options
29a0147
@jakubroztocil Merge pull request #330 from mihirvj/bash-completion
Bash auto completion
c1f2634
@jakubroztocil Merge pull request #319 from fay-jai/license
Update license with up-to-date year
6aad79d
@jakubroztocil Merge pull request #300 from msabramo/print_info_about_request_on_error
Print info about request on error
cbbaac1
@jakubroztocil Update CHANGELOG.rst
62407f7
@jakubroztocil Update CHANGELOG.rst
daf3573
@jakubroztocil Added mock to tests_require
483546d
Commits on Apr 11, 2015
@joaodelgado joaodelgado Only serialize json if data is a dict instance 6fd0f23
Commits on Apr 24, 2015
@jakubroztocil Merge pull request #337 from joaodelgado/json-serialization
Only serialize json if data is a dict instance
d8b819b