v0.9.4

Closes #485

.coveragerc

@@ -0,0 +1 @@
+; needs to exist otherwise `$ coveralls` fails

.editorconfig

@@ -0,0 +1,17 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.yml]
+indent_size = 2
+
+[Makefile]
+indent_style = tab
+indent_size = 8

.gitignore

@@ -1,11 +1,13 @@
-dist
+.DS_Store
-httpie.egg-info
+.idea/
-build
+__pycache__/
+dist/
+httpie.egg-info/
+build/
+*.egg-info
+.cache/
+.tox
+.coverage
 *.pyc
 *.egg
-.tox
-README.html
-.coverage
 htmlcov
-.idea
-.DS_Store

.travis.yml

@@ -1,20 +1,79 @@
-# https://travis-ci.org/jakubroztocil/httpie
+# https://travis-ci.org/jkbrzt/httpie
 sudo: false
+
+language: python
 os:
   - linux
-  - osx
+
 env:
   global:
-    - NEWEST_PYTHON=3.4
+    - NEWEST_PYTHON=3.5
-language: python
+
 python:
   - 2.6
   - 2.7
   - pypy
-  - 3.3
   - 3.4
+  - 3.5
   - pypy3
+
+matrix:
+
+  include:
+
+    # Manually defined OS X builds
+    # https://docs.travis-ci.com/user/multi-os/#Python-example-(unsupported-languages)
+
+    # Stock OSX Python
+    - os: osx
+      language: generic
+      env:
+        - TOXENV=py27
+
+    # Latest Python 2.x from Homebrew
+    - os: osx
+      language: generic
+      env:
+        - TOXENV=py27
+        - BREW_INSTALL=python
+
+    # Latest Python 3.x from Homebrew
+    - os: osx
+      language: generic
+      env:
+        - TOXENV=py35
+        - BREW_INSTALL=python3
+
+install:
+  - |
+    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+      if [[ -n "$BREW_INSTALL" ]]; then
+        brew update
+        brew install "$BREW_INSTALL"
+      fi
+      sudo pip install tox
+    fi
+
 script:
-  - make
+  - |
+    if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+      make
+    else
+      PATH="/usr/local/bin:$PATH" tox -e "$TOXENV"
+    fi
+
 after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == $NEWEST_PYTHON ]]; then pip install python-coveralls && coveralls; fi
+  - |
+    if [[ $TRAVIS_PYTHON_VERSION == $NEWEST_PYTHON && $TRAVIS_OS_NAME == 'linux' ]]; then
+      pip install python-coveralls && coveralls
+    fi
+
+notifications:
+
+  webhooks:
+    urls:
+      # https://gitter.im/jkbrzt/httpie
+      - https://webhooks.gitter.im/e/c42fcd359a110d02830b
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: always     # options: [always|never|change] default: always

AUTHORS.rst

@@ -2,12 +2,14 @@
 HTTPie authors
 ==============
 
-* `Jakub Roztocil <https://github.com/jakubroztocil>`_
+* `Jakub Roztocil <https://github.com/jkbrzt>`_
 
 
 Patches and ideas
 -----------------
 
+`Complete list of contributors on GitHib <https://github.com/jkbrzt/httpie/graphs/contributors>`_
+
 * `Cláudia T. Delgado <https://github.com/claudiatd>`_ (logo)
 * `Hank Gay <https://github.com/gthank>`_
 * `Jake Basile <https://github.com/jakebasile>`_
@@ -32,3 +34,7 @@ Patches and ideas
 * `Nathan LaFreniere <https://github.com/nlf>`_
 * `Matthias Lehmann <https://github.com/matleh>`_
 * `Dennis Brakhane <https://github.com/brakhane>`_
+* `Matt Layman <https://github.com/mblayman>`_
+* `Edward Yang <https://github.com/honorabrutroll>`_
+
+

CHANGELOG.rst

@@ -10,6 +10,44 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
 -------------------------
 
 
+`0.9.4`_ (2016-07-01)
+---------------------
+
+* Added ``Content-Type`` of files uploaded in ``multipart/form-data`` requests
+* Added ``--ssl=<PROTOCOL>`` to specify the desired SSL/TLS protocol version
+  to use for HTTPS requests.
+* Added JSON detection with ``--json, -j`` to work around incorrect
+  ``Content-Type``
+* Added ``--all`` to show intermediate responses such as redirects (with ``--follow``)
+* Added ``--history-print, -P WHAT`` to specify formatting of intermediate responses
+* Added ``--max-redirects=N`` (default 30)
+* Added ``-A`` as short name for ``--auth-type``
+* Added ``-F`` as short name for ``--follow``
+* Removed the ``implicit_content_type`` config option
+  (use ``"default_options": ["--form"]`` instead)
+* Redirected ``stdout`` doesn't trigger an error anymore when ``--output FILE``
+  is set
+* Changed the default ``--style`` back to ``solarized`` for better support
+  of light and dark terminals
+* Improved ``--debug`` output
+* Fixed ``--session`` when used with ``--download``
+* Fixed ``--download`` to trim too long filenames before saving the file
+* Fixed the handling of ``Content-Type`` with multiple ``+subtype`` parts
+* Removed the XML formatter as the implementation suffered from multiple issues
+
+
+
+`0.9.3`_ (2016-01-01)
+---------------------
+
+* Changed the default color ``--style`` from ``solarized`` to ``monokai``
+* Added basic Bash autocomplete support (need to be installed manually)
+* Added request details to connection error messages
+* Fixed ``'requests.packages.urllib3' has no attribute 'disable_warnings'``
+  errors that occurred in some installations
+* Fixed colors and formatting on Windows
+* Fixed ``--auth`` prompt on Windows
+
 
 `0.9.2`_ (2015-02-24)
 ---------------------
@@ -24,7 +62,7 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
 
 * Added support for Requests transport adapter plugins
   (see `httpie-unixsocket <https://github.com/msabramo/httpie-unixsocket>`_
-  and `httpie-http2 <https://github.com/jakubroztocil/httpie-http2>`_)
+  and `httpie-http2 <https://github.com/jkbrzt/httpie-http2>`_)
 
 
 `0.9.0`_ (2015-01-31)
@@ -228,25 +266,27 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
 * Initial public release
 
 
-.. _`0.1`: https://github.com/jakubroztocil/httpie/commit/b966efa
+.. _`0.1`: https://github.com/jkbrzt/httpie/commit/b966efa
-.. _0.1.4: https://github.com/jakubroztocil/httpie/compare/b966efa...0.1.4
+.. _0.1.4: https://github.com/jkbrzt/httpie/compare/b966efa...0.1.4
-.. _0.1.5: https://github.com/jakubroztocil/httpie/compare/0.1.4...0.1.5
+.. _0.1.5: https://github.com/jkbrzt/httpie/compare/0.1.4...0.1.5
-.. _0.1.6: https://github.com/jakubroztocil/httpie/compare/0.1.5...0.1.6
+.. _0.1.6: https://github.com/jkbrzt/httpie/compare/0.1.5...0.1.6
-.. _0.2.0: https://github.com/jakubroztocil/httpie/compare/0.1.6...0.2.0
+.. _0.2.0: https://github.com/jkbrzt/httpie/compare/0.1.6...0.2.0
-.. _0.2.1: https://github.com/jakubroztocil/httpie/compare/0.2.0...0.2.1
+.. _0.2.1: https://github.com/jkbrzt/httpie/compare/0.2.0...0.2.1
-.. _0.2.2: https://github.com/jakubroztocil/httpie/compare/0.2.1...0.2.2
+.. _0.2.2: https://github.com/jkbrzt/httpie/compare/0.2.1...0.2.2
-.. _0.2.5: https://github.com/jakubroztocil/httpie/compare/0.2.2...0.2.5
+.. _0.2.5: https://github.com/jkbrzt/httpie/compare/0.2.2...0.2.5
-.. _0.2.6: https://github.com/jakubroztocil/httpie/compare/0.2.5...0.2.6
+.. _0.2.6: https://github.com/jkbrzt/httpie/compare/0.2.5...0.2.6
-.. _0.2.7: https://github.com/jakubroztocil/httpie/compare/0.2.5...0.2.7
+.. _0.2.7: https://github.com/jkbrzt/httpie/compare/0.2.5...0.2.7
-.. _0.3.0: https://github.com/jakubroztocil/httpie/compare/0.2.7...0.3.0
+.. _0.3.0: https://github.com/jkbrzt/httpie/compare/0.2.7...0.3.0
-.. _0.4.0: https://github.com/jakubroztocil/httpie/compare/0.3.0...0.4.0
+.. _0.4.0: https://github.com/jkbrzt/httpie/compare/0.3.0...0.4.0
-.. _0.4.1: https://github.com/jakubroztocil/httpie/compare/0.4.0...0.4.1
+.. _0.4.1: https://github.com/jkbrzt/httpie/compare/0.4.0...0.4.1
-.. _0.5.0: https://github.com/jakubroztocil/httpie/compare/0.4.1...0.5.0
+.. _0.5.0: https://github.com/jkbrzt/httpie/compare/0.4.1...0.5.0
-.. _0.5.1: https://github.com/jakubroztocil/httpie/compare/0.5.0...0.5.1
+.. _0.5.1: https://github.com/jkbrzt/httpie/compare/0.5.0...0.5.1
-.. _0.6.0: https://github.com/jakubroztocil/httpie/compare/0.5.1...0.6.0
+.. _0.6.0: https://github.com/jkbrzt/httpie/compare/0.5.1...0.6.0
-.. _0.7.1: https://github.com/jakubroztocil/httpie/compare/0.6.0...0.7.1
+.. _0.7.1: https://github.com/jkbrzt/httpie/compare/0.6.0...0.7.1
-.. _0.8.0: https://github.com/jakubroztocil/httpie/compare/0.7.1...0.8.0
+.. _0.8.0: https://github.com/jkbrzt/httpie/compare/0.7.1...0.8.0
-.. _0.9.0: https://github.com/jakubroztocil/httpie/compare/0.8.0...0.9.0
+.. _0.9.0: https://github.com/jkbrzt/httpie/compare/0.8.0...0.9.0
-.. _0.9.1: https://github.com/jakubroztocil/httpie/compare/0.9.0...0.9.1
+.. _0.9.1: https://github.com/jkbrzt/httpie/compare/0.9.0...0.9.1
-.. _0.9.2: https://github.com/jakubroztocil/httpie/compare/0.9.1...0.9.2
+.. _0.9.2: https://github.com/jkbrzt/httpie/compare/0.9.1...0.9.2
-.. _1.0.0-dev: https://github.com/jakubroztocil/httpie/compare/0.9.2...master
+.. _0.9.3: https://github.com/jkbrzt/httpie/compare/0.9.2...0.9.3
+.. _0.9.4: https://github.com/jkbrzt/httpie/compare/0.9.3...0.9.4
+.. _1.0.0-dev: https://github.com/jkbrzt/httpie/compare/0.9.4...master

CONTRIBUTING.rst

@@ -1,12 +1,13 @@
+######################
 Contributing to HTTPie
 ######################
 
-Bug reports and code and documentation patches are greatly appretiated. You can
+Bug reports and code and documentation patches are welcome. You can
-also help by using the development version of HTTPie and reporting any bugs you
+help this project also by using the development version of HTTPie
-might encounter.
+and by reporting any bugs you might encounter.
 
-Bug Reports
+1. Reporting bugs
-===========
+=================
 
 **It's important that you provide the full command argument list
 as well as the output of the failing command.**
@@ -15,12 +16,12 @@ to your bug report, e.g.:
 
 .. code-block:: bash
 
-    $ http --debug [arguments that trigger the error]
+    $ http --debug [COMPLETE ARGUMENT LIST THAT TRIGGERS THE ERROR]
-    [complete output]
+    [COMPLETE OUTPUT]
 
 
-Contributing Code and Documentation
+2. Contributing Code and Docs
-===================================
+=============================
 
 Before working on a new feature or a bug, please browse `existing issues`_
 to see whether it has been previously discussed. If the change in question
@@ -28,8 +29,11 @@ is a bigger one, it's always good to discuss before your starting working on
 it.
 
 
-Development Environment
+Creating Development Environment
------------------------
+--------------------------------
+
+Go to https://github.com/jkbrzt/httpie and fork the project repository.
+
 
 .. code-block:: bash
 
@@ -52,44 +56,61 @@ Making Changes
 Please make sure your changes conform to `Style Guide for Python Code`_ (PEP8).
 
 
-Tests
+Testing
------
+-------
 
 Before opening a pull requests, please make sure the `test suite`_ passes
-in all of the `supported Python environments`_. You should also **add tests
+in all of the `supported Python environments`_. You should also add tests
-for any new features and bug fixes**.
+for any new features and bug fixes.
 
-HTTPie uses `pytest`_ and `Tox`_.
+HTTPie uses `pytest`_ and `Tox`_ for testing.
+
+
+Running all tests:
+******************
 
 .. code-block:: bash
 
-    ### Running all tests:
+    # Run all tests on the current Python interpreter
-
-    # Current Python
     make test
 
-    # Current Python with coverage
+    # Run all tests on the current Python with coverage
     make test-cover
 
-    # All the supported and available Pythons via Tox
+    # Run all tests in all of the supported and available Pythons via Tox
     make test-tox
 
-    ### Running specific tests:
+    # Run all tests for code as well as packaging, etc.
+    make test-all
 
-    # Current Python
-    pytest tests/test_uploads.py
 
-    # All Pythons
+Running specific tests:
+***********************
+
+.. code-block:: bash
+
+    # Run specific tests on the current Python
+    py.test tests/test_uploads.py
+    py.test tests/test_uploads.py::TestMultipartFormDataFileUpload
+    py.test tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok
+
+    # Run specific tests on the on all Pythons via Tox
     tox -- tests/test_uploads.py --verbose
+    tox -- tests/test_uploads.py::TestMultipartFormDataFileUpload --verbose
+    tox -- tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok --verbose
 
 
-Don't forget to add yourself to `AUTHORS.rst`_.
+-----
+
+See `Makefile`_ for additional development utilities.
+Don't forget to add yourself to `AUTHORS`_!
 
 
 .. _Tox: http://tox.testrun.org
-.. _supported Python environments: https://github.com/jakubroztocil/httpie/blob/master/tox.ini
+.. _supported Python environments: https://github.com/jkbrzt/httpie/blob/master/tox.ini
-.. _existing issues: https://github.com/jakubroztocil/httpie/issues?state=open
+.. _existing issues: https://github.com/jkbrzt/httpie/issues?state=open
-.. _AUTHORS.rst: https://github.com/jakubroztocil/httpie/blob/master/AUTHORS.rst
+.. _AUTHORS: https://github.com/jkbrzt/httpie/blob/master/AUTHORS.rst
+.. _Makefile: https://github.com/jkbrzt/httpie/blob/master/Makefile
 .. _pytest: http://pytest.org/
 .. _Style Guide for Python Code: http://python.org/dev/peps/pep-0008/
-.. _test suite: https://github.com/jakubroztocil/httpie/tree/master/tests
+.. _test suite: https://github.com/jkbrzt/httpie/tree/master/tests

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2012 Jakub Roztocil <jakub@roztocil.co>
+Copyright © 2012-2016 Jakub Roztocil <jakub@roztocil.co>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

Makefile

@@ -1,39 +1,42 @@
+#
+# See ./CONTRIBUTING.rst
+#
+
 VERSION=$(shell grep __version__ httpie/__init__.py)
 REQUIREMENTS="requirements-dev.txt"
 TAG="\n\n\033[0;32m\#\#\# "
 END=" \#\#\# \033[0m\n"
 
+
 all: test
 
-uninstall-httpie:
-	@echo $(TAG)Removing existing installation of HTTPie$(END)
-	- pip uninstall --yes httpie >/dev/null
-	! which http
-	@echo
-
-uninstall-all: uninstall-httpie
-	- pip uninstall --yes -r $(REQUIREMENTS)
 
 init: uninstall-httpie
 	@echo $(TAG)Installing dev requirements$(END)
 	pip install --upgrade -r $(REQUIREMENTS)
+
 	@echo $(TAG)Installing HTTPie$(END)
 	pip install --upgrade --editable .
+
 	@echo
 
+
 test: init
-	@echo $(TAG)Running tests in on current Python with coverage $(END)
+	@echo $(TAG)Running tests on the current Python interpreter with coverage $(END)
 	py.test --cov ./httpie --cov ./tests --doctest-modules --verbose ./httpie ./tests
 	@echo
 
+
 test-tox: init
 	@echo $(TAG)Running tests on all Pythons via Tox$(END)
 	tox
 	@echo
 
+
 test-dist: test-sdist test-bdist-wheel
 	@echo
 
+
 test-sdist: clean uninstall-httpie
 	@echo $(TAG)Testing sdist build an installation$(END)
 	python setup.py sdist
@@ -41,6 +44,7 @@ test-sdist: clean uninstall-httpie
 	which http
 	@echo
 
+
 test-bdist-wheel: clean uninstall-httpie
 	@echo $(TAG)Testing wheel build an installation$(END)
 	python setup.py bdist_wheel
@@ -48,9 +52,11 @@ test-bdist-wheel: clean uninstall-httpie
 	which http
 	@echo
 
+
 # This tests everything, even this Makefile.
 test-all: uninstall-all clean init test test-tox test-dist
 
+
 publish: test-all
 	@echo $(TAG)Testing wheel build an installation$(END)
 	@echo "$(VERSION)"
@@ -60,8 +66,29 @@ publish: test-all
 	python setup.py bdist_wheel upload
 	@echo
 
+
 clean:
 	@echo $(TAG)Cleaning up$(END)
 	rm -rf .tox *.egg dist build .coverage
 	find . -name '__pycache__' -delete -print -o -name '*.pyc' -delete -print
 	@echo
+
+
+uninstall-httpie:
+	@echo $(TAG)Uninstalling httpie$(END)
+	- pip uninstall --yes httpie &2>/dev/null
+
+	@echo "Verifying…"
+	cd .. && ! python -m httpie --version &2>/dev/null
+
+	@echo "Done"
+	@echo
+
+
+uninstall-all: uninstall-httpie
+
+	@echo $(TAG)Uninstalling httpie requirements$(END)
+	- pip uninstall --yes pygments requests
+
+	@echo $(TAG)Uninstalling development requirements$(END)
+	- pip uninstall --yes -r $(REQUIREMENTS)

README.rst

@@ -2,15 +2,15 @@
 HTTPie: a CLI, cURL-like tool for humans
 ****************************************
 
-HTTPie (pronounced *aych-tee-tee-pie*) is a **command line HTTP client**.  Its
+HTTPie (pronounced *aitch-tee-tee-pie*) is a **command line HTTP client**.
-goal is to make CLI interaction with web services as **human-friendly** as
+Its goal is to make CLI interaction with web services as **human-friendly**
-possible. It provides a simple ``http`` command that allows for sending
+as possible. It provides a simple ``http`` command that allows for sending
 arbitrary HTTP requests using a simple and natural syntax, and displays
 colorized output. HTTPie can be used for **testing, debugging**, and
 generally **interacting** with HTTP servers.
 
 
-.. image:: httpie.png
+.. image:: https://raw.githubusercontent.com/jkbrzt/httpie/master/httpie.png
     :alt: HTTPie compared to cURL
     :width: 679
     :height: 781
@@ -23,7 +23,7 @@ HTTPie is written in Python, and under the hood it uses the excellent
 
 -----
 
-|pypi| |unix_build| |windows_build| |coverage|
+|pypi| |unix_build| |windows_build| |coverage| |gitter|
 
 -----
 
@@ -58,19 +58,24 @@ Main Features
 Installation
 ============
 
---------------
-Stable version
---------------
 
-On **Mac OS X**, HTTPie can be installed via `Homebrew <http://brew.sh/>`_:
+On **Mac OS X**, HTTPie can be installed via `Homebrew <http://brew.sh/>`_
+(recommended):
 
 .. code-block:: bash
 
     $ brew install httpie
 
 
+A MacPorts *port* is also available:
+
+.. code-block:: bash
+
+    $ port install httpie
+
+
 Most **Linux** distributions provide a package that can be installed using the
-the system package manager, e.g.:
+system package manager, e.g.:
 
 .. code-block:: bash
 
@@ -109,7 +114,7 @@ The **latest development version** can be installed directly from GitHub:
     $ brew install httpie --HEAD
 
     # Universal
-    $ pip install --upgrade https://github.com/jakubroztocil/httpie/tarball/master
+    $ pip install --upgrade https://github.com/jkbrzt/httpie/archive/master.tar.gz
 
 
 
@@ -162,12 +167,12 @@ See the request that is being sent using one of the `output options`_:
 
 
 Use `Github API`_ to post a comment on an
-`issue <https://github.com/jakubroztocil/httpie/issues/83>`_
+`issue <https://github.com/jkbrzt/httpie/issues/83>`_
 with `authentication`_:
 
 .. code-block:: bash
 
-    $ http -a USERNAME POST https://api.github.com/repos/jakubroztocil/httpie/issues/83/comments body='HTTPie is awesome!'
+    $ http -a USERNAME POST https://api.github.com/repos/jkbrzt/httpie/issues/83/comments body='HTTPie is awesome!'
 
 
 Upload a file using `redirected input`_:
@@ -280,20 +285,22 @@ If the port is omitted, then port 80 is assumed.
     GET / HTTP/1.1
     Host: localhost
 
-If find yourself manually constructing URLs with **querystring parameters**
+If you find yourself manually constructing URLs with **querystring parameters**
 on the terminal, you may appreciate the ``param==value`` syntax for appending
-URL parameters so that you don't have to worry about escaping the ``&``
+URL parameters. With that, you don't have to worry about escaping the ``&``
-separators. To search for ``HTTPie`` on Google Images you could use this
+separators for you shell. Also, special characters in parameter values,
-command:
+will also automatically escaped (HTTPie otherwise expects the URL to be
+already escaped). To search for ``HTTPie logo`` on Google Images you could use
+this command:
 
 .. code-block:: bash
 
-    $ http GET www.google.com search==HTTPie tbm==isch
+    $ http www.google.com search=='HTTPie logo' tbm==isch
 
 
 .. code-block:: http
 
-    GET /?search=HTTPie&tbm=isch HTTP/1.1
+    GET /?search=HTTPie+logo&tbm=isch HTTP/1.1
 
 
 =============
@@ -318,7 +325,7 @@ their type is distinguished only by the separator used:
 +-----------------------+-----------------------------------------------------+
 | URL parameters        | Appends the given name/value pair as a query        |
 | ``name==value``       | string parameter to the URL.                        |
-|                       | The ``==`` separator is used                        |
+|                       | The ``==`` separator is used.                       |
 +-----------------------+-----------------------------------------------------+
 | Data Fields           | Request data fields to be serialized as a JSON      |
 | ``field=value``,      | object (default), or to be form-encoded             |
@@ -336,11 +343,29 @@ their type is distinguished only by the separator used:
 |                       | in a ``multipart/form-data`` request.               |
 +-----------------------+-----------------------------------------------------+
 
+
 You can use ``\`` to escape characters that shouldn't be used as separators
 (or parts thereof). For instance, ``foo\==bar`` will become a data key/value
 pair (``foo=`` and ``bar``) instead of a URL parameter.
 
-You can also quote values, e.g. ``foo="bar baz"``.
+Often it is necessary to quote the values, e.g. ``foo='bar baz'``.
+
+If any of the field names or headers starts with a minus
+(e.g., ``-fieldname``), you need to place all such items after the special
+token ``--`` to prevent confusion with ``--arguments``:
+
+.. code-block:: bash
+
+    $ http httpbin.org/post  --  -name-starting-with-dash=foo --Weird-Header:bar
+
+.. code-block:: http
+
+    POST /post HTTP/1.1
+    --Weird-Header: bar
+
+    {
+        "-name-starting-with-dash": "value"
+    }
 
 Note that data fields aren't the only way to specify request data:
 `Redirected input`_ allows for passing arbitrary data to be sent with the
@@ -366,7 +391,9 @@ both of which can be overwritten:
 You can use ``--json, -j`` to explicitly set ``Accept``
 to ``application/json`` regardless of whether you are sending data
 (it's a shortcut for setting the header via the usual header notation –
-``http url Accept:application/json``).
+``http url Accept:application/json``). Additionally,
+HTTPie will try to detect JSON responses even when the
+``Content-Type`` is incorrectly ``text/plain`` or unknown.
 
 Simple example:
 
@@ -449,7 +476,8 @@ Regular Forms
 
 .. code-block:: bash
 
-    $ http --form POST api.example.org/person/1 name='John Smith' email=john@example.org cv=@~/Documents/cv.txt
+    $ http --form POST api.example.org/person/1 name='John Smith' \
+        email=john@example.org cv=@~/Documents/cv.txt
 
 
 .. code-block:: http
@@ -494,7 +522,8 @@ To set custom headers you can use the ``Header:Value`` notation:
 
 .. code-block:: bash
 
-    $ http example.org  User-Agent:Bacon/1.0  'Cookie:valued-visitor=yes;foo=bar'  X-Foo:Bar  Referer:http://httpie.org/
+    $ http example.org  User-Agent:Bacon/1.0  'Cookie:valued-visitor=yes;foo=bar'  \
+        X-Foo:Bar  Referer:http://httpie.org/
 
 
 .. code-block:: http
@@ -535,12 +564,12 @@ The currently supported authentication schemes are Basic and Digest
                         the argument. Or, if you only specify a username
                         (``-a username``), you'll be prompted for
                         the password before the request is sent.
-                        To send a an empty password, pass ``username:``.
+                        To send an empty password, pass ``username:``.
                         The ``username:password@hostname`` URL syntax is
                         supported as well (but credentials passed via ``-a``
                         have higher priority).
 
-``--auth-type``         Specify the auth mechanism. Possible values are
+``--auth-type, -A``     Specify the auth mechanism. Possible values are
                         ``basic`` and ``digest``. The default value is
                         ``basic`` so it can often be omitted.
 ===================     ======================================================
@@ -560,7 +589,7 @@ Digest auth:
 
 .. code-block:: bash
 
-    $ http --auth-type=digest -a username:password example.org
+    $ http -A digest -a username:password example.org
 
 
 With password prompt:
@@ -588,11 +617,34 @@ Authorization information from your ``~/.netrc`` file is honored as well:
 Auth Plugins
 ------------
 
-* `httpie-oauth <https://github.com/jakubroztocil/httpie-oauth>`_: OAuth
+* `httpie-oauth <https://github.com/jkbrzt/httpie-oauth>`_: OAuth
-* `httpie-ntlm <https://github.com/jakubroztocil/httpie-ntlm>`_: NTLM (NT LAN Manager)
+* `httpie-hmac-auth <https://github.com/guardian/httpie-hmac-auth>`_: HMAC
+* `httpie-ntlm <https://github.com/jkbrzt/httpie-ntlm>`_: NTLM (NT LAN Manager)
 * `httpie-negotiate <https://github.com/ndzou/httpie-negotiate>`_: SPNEGO (GSS Negotiate)
 * `requests-hawk <https://github.com/mozilla-services/requests-hawk>`_: Hawk
 * `httpie-api-auth <https://github.com/pd/httpie-api-auth>`_: ApiAuth
+* `httpie-edgegrid <https://github.com/akamai-open/httpie-edgegrid>`_: EdgeGrid
+* `httpie-jwt-auth <https://github.com/teracyhq/httpie-jwt-auth>`_: JWTAuth (JSON Web Tokens)
+
+
+==============
+HTTP Redirects
+==============
+
+By default, HTTP redirects are not followed and only the first
+response is shown. To instruct HTTPie to follow the ``Location`` header of
+``30x`` responses and show the final response instead, use the ``--follow, -F`` option.
+
+If you additionally wish to see the intermediary requests/responses,
+then use the ``--all`` option as well.
+
+To change the default limit of maximum 30 redirects, use the
+``--max-redirects=<limit>`` option.
+
+
+.. code-block:: bash
+
+    $ http --follow --all --max-redirects=5 httpbin.org/redirect/3
 
 
 =======
@@ -678,6 +730,22 @@ path of the key file with ``--cert-key``:
     $ http --cert=client.crt --cert-key=client.key https://example.org
 
 
+-----------
+SSL version
+-----------
+
+Use the ``--ssl=<PROTOCOL>`` to specify the desired protocol version to use.
+This will default to SSL v2.3 which will negotiate the highest protocol that both
+the server and your installation of OpenSSL support. The available protocols
+are ``ssl2.3``, ``ssl3``, ``tls1``, ``tls1.1``, ``tls1.2``. (The actually
+available set of protocols may vary depending on your OpenSSL installation.)
+
+.. code-block:: bash
+
+    # Specify the vulnerable SSL v3 protocol to talk to an outdated server:
+    $ http --ssl=ssl3 https://vulnerable.example.org
+
+
 ----------------------------
 SNI (Server Name Indication)
 ----------------------------
@@ -703,8 +771,8 @@ You can use the following command to test SNI support:
 Output Options
 ==============
 
-By default, HTTPie outputs the whole response message (headers as well as the
+By default, HTTPie only outputs the final response and the whole response
-body).
+message is printed (headers as well as the body).
 
 You can control what should be printed via several options:
 
@@ -712,6 +780,7 @@ You can control what should be printed via several options:
 ``--headers, -h``   Only the response headers are printed.
 ``--body, -b``      Only the response body is printed.
 ``--verbose, -v``   Print the whole HTTP exchange (request and response).
+                    This option also enables ``--all`` (see bellow).
 ``--print, -p``     Selects parts of the HTTP exchange.
 =================   =====================================================
 
@@ -752,10 +821,10 @@ the HTTP exchange:
 ==========  ==================
 Character   Stands for
 ==========  ==================
-``H``       Request headers.
+``H``       request headers
-``B``       Request body.
+``B``       request body
-``h``       Response headers.
+``h``       response headers
-``b``       Response body.
+``b``       response body
 ==========  ==================
 
 Print request and response headers:
@@ -765,6 +834,34 @@ Print request and response headers:
     $ http --print=Hh PUT httpbin.org/put hello=world
 
 
+---------------------------------------
+Viewing Intermediary Requests/Responses
+---------------------------------------
+
+To see *all* the HTTP communication, i.e. the final request/resposne as
+well as any possible  intermediary requests/responses, use the **``--all``**
+option. The intermediary HTTP communication include followed redirects
+(with ``--follow``), the first unauthorized request when HTTP digest
+authentication is used (``--auth=digest``), etc.
+
+.. code-block:: bash
+
+    # Include all responses that lead to the final one:
+    $ http --all --follow httpbin.org/redirect/3
+
+
+The intermediary requests/response are by default formatted according to
+``--print, -p`` (and its shortcuts described above). If you'd like to change
+that, use the ``--history-print, -P`` option. It takes the same
+arguments as ``--print, -p`` but applies to the intermediary requests only.
+
+
+.. code-block:: bash
+
+    # Print the intermediary requests/responses differently than the final one:
+    $ http -A digest -a foo:bar --all -p Hh -P H httpbin.org/digest-auth/auth/foo/bar
+
+
 -------------------------
 Conditional Body Download
 -------------------------
@@ -824,7 +921,7 @@ You can even pipe web services together using HTTPie:
 
 .. code-block:: bash
 
-    $ http GET https://api.github.com/repos/jakubroztocil/httpie | http POST httpbin.org/post
+    $ http GET https://api.github.com/repos/jkbrzt/httpie | http POST httpbin.org/post
 
 
 You can use ``cat`` to enter multiline data on the terminal:
@@ -894,7 +991,7 @@ Colors and Formatting
 ---------------------
 
 Syntax highlighting is applied to HTTP headers and bodies (where it makes
-sense). You can choose your prefered color scheme via the ``--style`` option
+sense). You can choose your preferred color scheme via the ``--style`` option
 if you don't like the default one (see ``$ http --help`` for the possible
 values).
 
@@ -903,7 +1000,6 @@ Also, the following formatting is applied:
 * HTTP headers are sorted by name.
 * JSON data is indented, sorted by keys, and unicode escapes are converted
   to the characters they represent.
-* XML data is indented for better readability.
 
 One of these options can be used to control output processing:
 
@@ -1008,20 +1104,17 @@ is being saved to a file.
 
 .. code-block:: bash
 
-    $ http --download https://github.com/jakubroztocil/httpie/tarball/master
+    $ http --download https://github.com/jkbrzt/httpie/archive/master.tar.gz
 
 .. code-block:: http
 
     HTTP/1.1 200 OK
-    Connection: keep-alive
+    Content-Disposition: attachment; filename=httpie-master.tar.gz
-    Content-Disposition: attachment; filename=jakubroztocil-httpie-0.4.1-33-gfc4f70a.tar.gz
+    Content-Length: 257336
-    Content-Length: 505530
     Content-Type: application/x-gzip
-    Server: GitHub.com
-    Vary: Accept-Encoding
 
-    Downloading 494.89 kB to "jakubroztocil-httpie-0.4.1-33-gfc4f70a.tar.gz"
+    Downloading 251.30 kB to "httpie-master.tar.gz"
-    /  21.01% 104.00 kB   47.55 kB/s  0:00:08 ETA
+    Done. 251.30 kB in 2.73862s (91.76 kB/s)
 
 
 If not provided via ``--output, -o``, the output filename will be determined
@@ -1034,7 +1127,7 @@ headers and progress are still shown in the terminal:
 
 .. code-block:: bash
 
-    $ http -d https://github.com/jakubroztocil/httpie/tarball/master |  tar zxf -
+    $ http -d https://github.com/jkbrzt/httpie/archive/master.tar.gz |  tar zxf -
 
 
 If ``--output, -o`` is specified, you can resume a partial download using the
@@ -1165,36 +1258,32 @@ Config
 HTTPie uses a simple configuration file that contains a JSON object with the
 following keys:
 
-=========================     =================================================
-``__meta__``                  HTTPie automatically stores some metadata here.
-                              Do not change.
 
-``implicit_content_type``     A ``String`` specifying the implicit content type
+------------
-                              for request data. The default value for this
+``__meta__``
-                              option is ``json`` and can be changed to
+------------
-                              ``form``.
 
-``default_options``           An ``Array`` (by default empty) of options
+HTTPie automatically stores some of its metadata here. Do not change.
-                              that should be applied to every request.
 
-                              For instance, you can use this option to change
-                              the default style and output options:
-                              ``"default_options": ["--style=fruity", "--body"]``
 
-                              Another useful default option is
+-------------------
-                              ``"--session=default"`` to make HTTPie always
+``default_options``
-                              use `sessions`_.
+-------------------
 
-                              Default options from config file can be unset
+An ``Array`` (by default empty) of default options that should be applied to
-                              for a particular invocation via
+every invocation of HTTPie.
-                              ``--no-OPTION`` arguments passed on the
-                              command line (e.g., ``--no-style``
-                              or ``--no-session``).
-=========================     =================================================
 
-The default location of the configuration file is ``~/.httpie/config.json``
+For instance, you can use this option to change the default style and output
-(or ``%APPDATA%\httpie\config.json`` on Windows).
+options: ``"default_options": ["--style=fruity", "--body"]`` Another useful
+default option could be ``"--session=default"`` to make HTTPie always
+use `sessions`_ (one named ``default`` will automatically be used).
+Or you could change the implicit request content type from JSON to form by
+adding ``--form`` to the list.
 
+Default options from config file can be unset for a particular invocation via
+``--no-OPTION`` arguments passed on the command line (e.g., ``--no-style``
+or ``--no-session``). The default location of the configuration file is
+``~/.httpie/config.json`` (or ``%APPDATA%\httpie\config.json`` on Windows).
 The config directory location can be changed by setting the
 ``HTTPIE_CONFIG_DIR`` environment variable.
 
@@ -1226,6 +1315,7 @@ Also, the ``--timeout`` option allows to overwrite the default 30s timeout:
             3) echo 'Unexpected HTTP 3xx Redirection!' ;;
             4) echo 'HTTP 4xx Client Error!' ;;
             5) echo 'HTTP 5xx Server Error!' ;;
+            6) echo 'Exceeded --max-redirects=<n> redirects!' ;;
             *) echo 'Other Error!' ;;
         esac
     fi
@@ -1278,12 +1368,27 @@ HTTPie reaches its final version ``1.0``. All changes are recorded in the
 
 
 
+=======
+Support
+=======
+
+Please use the following support channels:
+
+* `GitHub issues <https://github.com/jkbr/httpie/issues>`_
+  for bug reports and feature requests.
+* `Our Gitter chat room <https://gitter.im/jkbrzt/httpie>`_
+  to ask questions, discuss features, and for general discussion.
+* `StackOverflow <https://stackoverflow.com>`_
+  to ask questions (please make sure to use the
+  `httpie <http://stackoverflow.com/questions/tagged/httpie>`_ tag).
+* You can also tweet directly to `@jkbrzt`_.
+
 =======
 Authors
 =======
 
 
-`Jakub Roztocil`_  (`@jakubroztocil`_) created HTTPie and `these fine people`_
+`Jakub Roztocil`_  (`@jkbrzt`_) created HTTPie and `these fine people`_
 have contributed.
 
 
@@ -1298,21 +1403,21 @@ Please see `claudiatd/httpie-artwork`_
 Contribute
 ==========
 
-Please see `CONTRIBUTING <https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst>`_.
+Please see `CONTRIBUTING <https://github.com/jkbrzt/httpie/blob/master/CONTRIBUTING.rst>`_.
 
 
 ==========
 Change Log
 ==========
 
-Please see `CHANGELOG <https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst>`_.
+Please see `CHANGELOG <https://github.com/jkbrzt/httpie/blob/master/CHANGELOG.rst>`_.
 
 
 =======
 Licence
 =======
 
-Please see `LICENSE <https://github.com/jakubroztocil/httpie/blob/master/LICENSE>`_.
+Please see `LICENSE <https://github.com/jkbrzt/httpie/blob/master/LICENSE>`_.
 
 
 
@@ -1320,24 +1425,29 @@ Please see `LICENSE <https://github.com/jakubroztocil/httpie/blob/master/LICENSE
 .. _Pygments: http://pygments.org/
 .. _pip: http://www.pip-installer.org/en/latest/index.html
 .. _Github API: http://developer.github.com/v3/issues/comments/#create-a-comment
-.. _these fine people: https://github.com/jakubroztocil/httpie/contributors
+.. _these fine people: https://github.com/jkbrzt/httpie/contributors
-.. _Jakub Roztocil: http://subtleapps.com
+.. _Jakub Roztocil: http://roztocil.co
-.. _@jakubroztocil: https://twitter.com/jakubroztocil
+.. _@jkbrzt: https://twitter.com/jkbrzt
 .. _claudiatd/httpie-artwork: https://github.com/claudiatd/httpie-artwork
 
 
-.. |pypi| image:: https://img.shields.io/pypi/v/httpie.svg?style=flat-square&label=latest%20version
+.. |pypi| image:: https://img.shields.io/pypi/v/httpie.svg?style=flat-square&label=latest%20stable%20version
     :target: https://pypi.python.org/pypi/httpie
     :alt: Latest version released on PyPi
 
-.. |coverage| image:: https://img.shields.io/coveralls/jakubroztocil/httpie/master.svg?style=flat-square
+.. |coverage| image:: https://img.shields.io/coveralls/jkbrzt/httpie/master.svg?style=flat-square&label=coverage
-    :target: https://coveralls.io/r/jakubroztocil/httpie?branch=master
+    :target: https://coveralls.io/r/jkbrzt/httpie?branch=master
     :alt: Test coverage
 
-.. |unix_build| image:: https://img.shields.io/travis/jakubroztocil/httpie/master.svg?style=flat-square&label=unix%20build
+.. |unix_build| image:: https://img.shields.io/travis/jkbrzt/httpie/master.svg?style=flat-square&label=unix%20build
-    :target: http://travis-ci.org/jakubroztocil/httpie
+    :target: http://travis-ci.org/jkbrzt/httpie
     :alt: Build status of the master branch on Mac/Linux
 
-.. |windows_build|  image:: https://img.shields.io/appveyor/ci/jakubroztocil/httpie.svg?style=flat-square&label=windows%20build
+.. |windows_build|  image:: https://img.shields.io/appveyor/ci/jkbrzt/httpie.svg?style=flat-square&label=windows%20build
-    :target: https://ci.appveyor.com/project/jakubroztocil/httpie
+    :target: https://ci.appveyor.com/project/jkbrzt/httpie
     :alt: Build status of the master branch on Windows
+
+.. |gitter| image:: https://badges.gitter.im/jkbrzt/httpie.svg
+    :target: https://gitter.im/jkbrzt/httpie
+    :alt: Chat on Gitter
+

appveyor.yml

@@ -1,16 +1,22 @@
-# https://ci.appveyor.com/project/jakubroztocil/httpie
+# https://ci.appveyor.com/project/jkbrzt/httpie
 build: false
+
 environment:
   matrix:
     - PYTHON: "C:/Python27"
-    - PYTHON: "C:/Python34"
+    # Python 3.4 has outdated pip
+    # - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python35"
+
 init:
   - "ECHO %PYTHON%"
   - ps: "ls C:/Python*"
+
 install:
-  - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
+  # FIXME: updating pip fails with PermissionError
-  - "%PYTHON%/python.exe C:/get-pip.py"
+  # - "%PYTHON%/Scripts/pip.exe install -U pip setuptools"
   - "%PYTHON%/Scripts/pip.exe install -e ."
+
 test_script:
   - "%PYTHON%/Scripts/pip.exe --version"
   - "%PYTHON%/Scripts/http.exe --debug"

httpie-completion.bash

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+
+_http_complete() {
+    local cur_word=${COMP_WORDS[COMP_CWORD]}
+    local prev_word=${COMP_WORDS[COMP_CWORD - 1]}
+
+    if [[ "$cur_word" == -*  ]]; then
+        _http_complete_options "$cur_word"
+    fi
+}
+
+complete -o default -F _http_complete http
+
+_http_complete_options() {
+    local cur_word=$1
+    local options="-j --json -f --form --pretty -s --style -p --print
+    -v --verbose -h --headers -b --body -S --stream -o --output -d --download
+    -c --continue --session --session-read-only -a --auth --auth-type --proxy
+    --follow --verify --cert --cert-key --timeout --check-status --ignore-stdin
+    --help --version --traceback --debug"
+    COMPREPLY=( $( compgen -W "$options" -- "$cur_word" ) )
+}

httpie/__init__.py

@@ -3,7 +3,7 @@ HTTPie - a CLI, cURL-like tool for humans.
 
 """
 __author__ = 'Jakub Roztocil'
-__version__ = '0.9.2'
+__version__ = '0.9.4'
 __licence__ = 'BSD'
 
 
@@ -12,8 +12,16 @@ class ExitStatus:
     OK = 0
     ERROR = 1
     ERROR_TIMEOUT = 2
+    ERROR_TOO_MANY_REDIRECTS = 6
 
     # Used only when requested with --check-status:
     ERROR_HTTP_3XX = 3
     ERROR_HTTP_4XX = 4
     ERROR_HTTP_5XX = 5
+
+
+EXIT_STATUS_LABELS = dict(
+    (value, key)
+    for key, value in ExitStatus.__dict__.items()
+    if key.isupper()
+)

httpie/cli.py

@@ -4,7 +4,7 @@ NOTE: the CLI interface may change before reaching v1.0.
 
 """
 from textwrap import dedent, wrap
-#noinspection PyCompatibility
+# noinspection PyCompatibility
 from argparse import (RawDescriptionHelpFormatter, FileType,
                       OPTIONAL, ZERO_OR_MORE, SUPPRESS)
 
@@ -13,13 +13,14 @@ from httpie.plugins.builtin import BuiltinAuthPlugin
 from httpie.plugins import plugin_manager
 from httpie.sessions import DEFAULT_SESSIONS_DIR
 from httpie.output.formatters.colors import AVAILABLE_STYLES, DEFAULT_STYLE
-from httpie.input import (Parser, AuthCredentialsArgType, KeyValueArgType,
+from httpie.input import (HTTPieArgumentParser,
+                          AuthCredentialsArgType, KeyValueArgType,
                           SEP_PROXY, SEP_CREDENTIALS, SEP_GROUP_ALL_ITEMS,
                           OUT_REQ_HEAD, OUT_REQ_BODY, OUT_RESP_HEAD,
                           OUT_RESP_BODY, OUTPUT_OPTIONS,
                           OUTPUT_OPTIONS_DEFAULT, PRETTY_MAP,
                           PRETTY_STDOUT_TTY_ONLY, SessionNameValidator,
-                          readable_file_arg)
+                          readable_file_arg, SSL_VERSION_ARG_MAPPING)
 
 
 class HTTPieHelpFormatter(RawDescriptionHelpFormatter):
@@ -40,7 +41,7 @@ class HTTPieHelpFormatter(RawDescriptionHelpFormatter):
         text = dedent(text).strip() + '\n\n'
         return text.splitlines()
 
-parser = Parser(
+parser = HTTPieArgumentParser(
     formatter_class=HTTPieHelpFormatter,
     description='%s <http://httpie.org>' % __doc__.strip(),
     epilog=dedent("""
@@ -49,9 +50,9 @@ parser = Parser(
 
     Suggestions and bug reports are greatly appreciated:
 
-        https://github.com/jakubroztocil/httpie/issues
+        https://github.com/jkbrzt/httpie/issues
 
-    """)
+    """),
 )
 
 
@@ -249,17 +250,6 @@ output_options.add_argument(
         default=OUTPUT_OPTIONS_DEFAULT,
     )
 )
-output_options.add_argument(
-    '--verbose', '-v',
-    dest='output_options',
-    action='store_const',
-    const=''.join(OUTPUT_OPTIONS),
-    help="""
-    Print the whole request as well as the response. Shortcut for --print={0}.
-
-    """
-    .format(''.join(OUTPUT_OPTIONS))
-)
 output_options.add_argument(
     '--headers', '-h',
     dest='output_options',
@@ -283,6 +273,42 @@ output_options.add_argument(
     .format(OUT_RESP_BODY)
 )
 
+output_options.add_argument(
+    '--verbose', '-v',
+    dest='verbose',
+    action='store_true',
+    help="""
+    Verbose output. Print the whole request as well as the response. Also print
+    any intermediary requests/responses (such as redirects).
+    It's a shortcut for: --all --print={0}
+
+    """
+    .format(''.join(OUTPUT_OPTIONS))
+)
+output_options.add_argument(
+    '--all',
+    default=False,
+    action='store_true',
+    help="""
+    By default, only the final request/response is shown. Use this flag to show
+    any intermediary requests/responses as well. Intermediary requests include
+    followed redirects (with --follow), the first unauthorized request when
+    Digest auth is used (--auth=digest), etc.
+
+    """
+)
+output_options.add_argument(
+    '--history-print', '-P',
+    dest='output_options_history',
+    metavar='WHAT',
+    help="""
+    The same as --print, -p but applies only to intermediary requests/responses
+    (such as redirects) when their inclusion is enabled with --all. If this
+    options is not specified, then they are formatted the same way as the final
+    response.
+
+    """
+)
 output_options.add_argument(
     '--stream', '-S',
     action='store_true',
@@ -307,8 +333,9 @@ output_options.add_argument(
     dest='output_file',
     metavar='FILE',
     help="""
-    Save output to FILE. If --download is set, then only the response body is
+    Save output to FILE instead of stdout. If --download is also set, then only
-    saved to the file. Other parts of the HTTP exchange are printed to stderr.
+    the response body is saved to FILE. Other parts of the HTTP exchange are
+    printed to stderr.
 
     """
 
@@ -377,7 +404,6 @@ sessions.add_argument(
     """
 )
 
-
 #######################################################################
 # Authentication
 #######################################################################
@@ -397,7 +423,7 @@ auth.add_argument(
 
 _auth_plugins = plugin_manager.get_auth_plugins()
 auth.add_argument(
-    '--auth-type',
+    '--auth-type', '-A',
     choices=[plugin.auth_type for plugin in _auth_plugins],
     default=_auth_plugins[0].auth_type,
     help="""
@@ -444,45 +470,21 @@ network.add_argument(
     """
 )
 network.add_argument(
-    '--follow',
+    '--follow', '-F',
     default=False,
     action='store_true',
     help="""
-    Set this flag if full redirects are allowed (e.g. re-POST-ing of data at
+    Follow 30x Location redirects.
-    new Location).
-
-    """
-)
-network.add_argument(
-    '--verify',
-    default='yes',
-    help="""
-    Set to "no" to skip checking the host's SSL certificate. You can also pass
-    the path to a CA_BUNDLE file for private certs. You can also set the
-    REQUESTS_CA_BUNDLE environment variable. Defaults to "yes".
 
     """
 )
 
 network.add_argument(
-    '--cert',
+    '--max-redirects',
-    default=None,
+    type=int,
-    type=readable_file_arg,
+    default=30,
     help="""
-    You can specify a local cert to use as client side SSL certificate.
+    By default, requests have a limit of 30 redirects (works with --follow).
-    This file may either contain both private key and certificate or you may
-    specify --cert-key separately.
-
-    """
-)
-
-network.add_argument(
-    '--cert-key',
-    default=None,
-    type=readable_file_arg,
-    help="""
-    The private key to use with SSL. Only needed if --cert is given and the
-    certificate file does not contain the private key.
 
     """
 )
@@ -516,6 +518,57 @@ network.add_argument(
 )
 
 
+#######################################################################
+# SSL
+#######################################################################
+
+ssl = parser.add_argument_group(title='SSL')
+ssl.add_argument(
+    '--verify',
+    default='yes',
+    help="""
+    Set to "no" to skip checking the host's SSL certificate. You can also pass
+    the path to a CA_BUNDLE file for private certs. You can also set the
+    REQUESTS_CA_BUNDLE environment variable. Defaults to "yes".
+
+    """
+)
+ssl.add_argument(
+    '--ssl',  # TODO: Maybe something more general, such as --secure-protocol?
+    dest='ssl_version',
+    choices=list(sorted(SSL_VERSION_ARG_MAPPING.keys())),
+    help="""
+    The desired protocol version to use. This will default to
+    SSL v2.3 which will negotiate the highest protocol that both
+    the server and your installation of OpenSSL support. Available protocols
+    may vary depending on OpenSSL installation (only the supported ones
+    are shown here).
+
+    """
+)
+ssl.add_argument(
+    '--cert',
+    default=None,
+    type=readable_file_arg,
+    help="""
+    You can specify a local cert to use as client side SSL certificate.
+    This file may either contain both private key and certificate or you may
+    specify --cert-key separately.
+
+    """
+)
+
+ssl.add_argument(
+    '--cert-key',
+    default=None,
+    type=readable_file_arg,
+    help="""
+    The private key to use with SSL. Only needed if --cert is given and the
+    certificate file does not contain the private key.
+
+    """
+)
+
 #######################################################################
 # Troubleshooting
 #######################################################################
@@ -554,7 +607,7 @@ troubleshooting.add_argument(
     action='store_true',
     default=False,
     help="""
-    Prints exception traceback should one occur.
+    Prints the exception traceback should one occur.
 
     """
 )
@@ -563,8 +616,8 @@ troubleshooting.add_argument(
     action='store_true',
     default=False,
     help="""
-    Prints exception traceback should one occur, and also other information
+    Prints the exception traceback should one occur, as well as other
-    that is useful for debugging HTTPie itself and for reporting bugs.
+    information useful for debugging HTTPie itself and for reporting bugs.
 
     """
 )

httpie/client.py

@@ -3,16 +3,25 @@ import sys
 from pprint import pformat
 
 import requests
+from requests.adapters import HTTPAdapter
 from requests.packages import urllib3
 
 from httpie import sessions
 from httpie import __version__
 from httpie.compat import str
+from httpie.input import SSL_VERSION_ARG_MAPPING
 from httpie.plugins import plugin_manager
+from httpie.utils import repr_dict_nice
 
-
+try:
-# https://urllib3.readthedocs.org/en/latest/security.html
+    # https://urllib3.readthedocs.io/en/latest/security.html
-urllib3.disable_warnings()
+    urllib3.disable_warnings()
+except AttributeError:
+    # In some rare cases, the user may have an old version of the requests
+    # or urllib3, and there is no method called "disable_warnings." In these
+    # cases, we don't need to call the method.
+    # They may get some noisy output but execution shouldn't die. Move on.
+    pass
 
 
 FORM = 'application/x-www-form-urlencoded; charset=utf-8'
@@ -20,9 +29,24 @@ JSON = 'application/json'
 DEFAULT_UA = 'HTTPie/%s' % __version__
 
 
-def get_requests_session():
+class HTTPieHTTPAdapter(HTTPAdapter):
+
+    def __init__(self, ssl_version=None, **kwargs):
+        self._ssl_version = ssl_version
+        super(HTTPieHTTPAdapter, self).__init__(**kwargs)
+
+    def init_poolmanager(self, *args, **kwargs):
+        kwargs['ssl_version'] = self._ssl_version
+        super(HTTPieHTTPAdapter, self).init_poolmanager(*args, **kwargs)
+
+
+def get_requests_session(ssl_version):
     requests_session = requests.Session()
-    for cls in plugin_manager.get_trasnsport_plugins():
+    requests_session.mount(
+        'https://',
+        HTTPieHTTPAdapter(ssl_version=ssl_version)
+    )
+    for cls in plugin_manager.get_transport_plugins():
         transport_plugin = cls()
         requests_session.mount(prefix=transport_plugin.prefix,
                                adapter=transport_plugin.get_adapter())
@@ -32,7 +56,12 @@ def get_requests_session():
 def get_response(args, config_dir):
     """Send the request and return a `request.Response`."""
 
-    requests_session = get_requests_session()
+    ssl_version = None
+    if args.ssl_version:
+        ssl_version = SSL_VERSION_ARG_MAPPING[args.ssl_version]
+
+    requests_session = get_requests_session(ssl_version)
+    requests_session.max_redirects = args.max_redirects
 
     if not args.session and not args.session_read_only:
         kwargs = get_requests_kwargs(args)
@@ -52,13 +81,13 @@ def get_response(args, config_dir):
 
 
 def dump_request(kwargs):
-    sys.stderr.write('\n>>> requests.request(%s)\n\n'
+    sys.stderr.write('\n>>> requests.request(**%s)\n\n'
-                     % pformat(kwargs))
+                     % repr_dict_nice(kwargs))
 
 
 def encode_headers(headers):
     # This allows for unicode headers which is non-standard but practical.
-    # See: https://github.com/jakubroztocil/httpie/issues/212
+    # See: https://github.com/jkbrzt/httpie/issues/212
     return dict(
         (name, value.encode('utf8') if isinstance(value, str) else value)
         for name, value in headers.items()
@@ -92,7 +121,7 @@ def get_requests_kwargs(args, base_headers=None):
     # Serialize JSON data, if needed.
     data = args.data
     auto_json = data and not args.form
-    if args.json or auto_json and isinstance(data, dict):
+    if (args.json or auto_json) and isinstance(data, dict):
         if data:
             data = json.dumps(data)
         else:

httpie/compat.py

@@ -5,13 +5,11 @@ Python 2.6, 2.7, and 3.x compatibility.
 import sys
 
 
-# Taken from `requests.compat`
+is_py2 = sys.version_info[0] == 2
-_ver = sys.version_info
+is_py26 = sys.version_info[:2] == (2, 6)
-is_py2 = (_ver[0] == 2)
+is_py27 = sys.version_info[:2] == (2, 7)
-is_py26 = (is_py2 and _ver[1] == 6)
+is_py3 = sys.version_info[0] == 3
-is_py27 = (is_py2 and _ver[1] == 7)
+is_pypy = 'pypy' in sys.version.lower()
-is_py3 = (_ver[0] == 3)
-is_pypy = ('pypy' in _ver)
 is_windows = 'win32' in str(sys.platform).lower()
 
 

httpie/config.py

@@ -6,11 +6,11 @@ from httpie import __version__
 from httpie.compat import is_windows
 
 
-DEFAULT_CONFIG_DIR = os.environ.get(
+DEFAULT_CONFIG_DIR = str(os.environ.get(
     'HTTPIE_CONFIG_DIR',
     os.path.expanduser('~/.httpie') if not is_windows else
     os.path.expandvars(r'%APPDATA%\\httpie')
-)
+))
 
 
 class BaseConfigDict(dict):
@@ -80,11 +80,10 @@ class BaseConfigDict(dict):
 class Config(BaseConfigDict):
 
     name = 'config'
-    helpurl = 'https://github.com/jakubroztocil/httpie#config'
+    helpurl = 'https://github.com/jkbrzt/httpie#config'
     about = 'HTTPie configuration file'
 
     DEFAULTS = {
-        'implicit_content_type': 'json',
         'default_options': []
     }
 
@@ -93,5 +92,21 @@ class Config(BaseConfigDict):
         self.update(self.DEFAULTS)
         self.directory = directory
 
+    def load(self):
+        super(Config, self).load()
+        self._migrate_implicit_content_type()
+
     def _get_path(self):
         return os.path.join(self.directory, self.name + '.json')
+
+    def _migrate_implicit_content_type(self):
+        """Migrate the removed implicit_content_type config option"""
+        try:
+            implicit_content_type = self.pop('implicit_content_type')
+        except KeyError:
+            pass
+        else:
+            if implicit_content_type == 'form':
+                self['default_options'].insert(0, '--form')
+            self.save()
+            self.load()

httpie/context.py

@@ -3,6 +3,8 @@ import sys
 from httpie.compat import is_windows
 from httpie.config import DEFAULT_CONFIG_DIR, Config
 
+from httpie.utils import repr_dict_nice
+
 
 class Environment(object):
     """
@@ -82,3 +84,17 @@ class Environment(object):
             else:
                 self._config.load()
         return self._config
+
+    def __str__(self):
+        defaults = dict(type(self).__dict__)
+        actual = dict(defaults)
+        actual.update(self.__dict__)
+        actual['config'] = self.config
+        return repr_dict_nice(dict(
+            (key, value)
+            for key, value in actual.items()
+            if not key.startswith('_'))
+        )
+
+    def __repr__(self):
+        return '<{0} {1}>'.format(type(self).__name__, str(self))

httpie/core.py

@@ -12,6 +12,7 @@ Invocation flow:
 """
 import sys
 import errno
+import platform
 
 import requests
 from requests import __version__ as requests_version
@@ -20,12 +21,13 @@ from pygments import __version__ as pygments_version
 from httpie import __version__ as httpie_version, ExitStatus
 from httpie.compat import str, bytes, is_py3
 from httpie.client import get_response
-from httpie.downloads import Download
+from httpie.downloads import Downloader
 from httpie.context import Environment
 from httpie.plugins import plugin_manager
 from httpie.output.streams import (
     build_output_stream,
-    write, write_with_colors_win_py3
+    write_stream,
+    write_stream_with_colors_win_py3
 )
 
 
@@ -47,11 +49,14 @@ def get_exit_status(http_status, follow=False):
 def print_debug_info(env):
     env.stderr.writelines([
         'HTTPie %s\n' % httpie_version,
-        'HTTPie data: %s\n' % env.config.directory,
         'Requests %s\n' % requests_version,
         'Pygments %s\n' % pygments_version,
-        'Python %s %s\n' % (sys.version, sys.platform)
+        'Python %s\n%s\n' % (sys.version, sys.executable),
+        '%s %s' % (platform.system(), platform.release()),
     ])
+    env.stderr.write('\n\n')
+    env.stderr.write(repr(env))
+    env.stderr.write('\n')
 
 
 def decode_args(args, stdin_encoding):
@@ -67,8 +72,109 @@ def decode_args(args, stdin_encoding):
     ]
 
 
-def main(args=sys.argv[1:], env=Environment()):
+def program(args, env, log_error):
-    """Run the main program and write the output to ``env.stdout``.
+    """
+    The main program without error handling
+
+    :param args: parsed args (argparse.Namespace)
+    :type env: Environment
+    :param log_error: error log function
+    :return: status code
+
+    """
+    exit_status = ExitStatus.OK
+    downloader = None
+    show_traceback = args.debug or args.traceback
+
+    try:
+        if args.download:
+            args.follow = True  # --download implies --follow.
+            downloader = Downloader(
+                output_file=args.output_file,
+                progress_file=env.stderr,
+                resume=args.download_resume
+            )
+            downloader.pre_request(args.headers)
+
+        final_response = get_response(args, config_dir=env.config.directory)
+        if args.all:
+            responses = final_response.history + [final_response]
+        else:
+            responses = [final_response]
+
+        for response in responses:
+
+            if args.check_status or downloader:
+                exit_status = get_exit_status(
+                    http_status=response.status_code,
+                    follow=args.follow
+                )
+                if not env.stdout_isatty and exit_status != ExitStatus.OK:
+                    log_error(
+                        'HTTP %s %s', response.raw.status, response.raw.reason,
+                        level='warning'
+                    )
+
+            write_stream_kwargs = {
+                'stream': build_output_stream(
+                    args=args,
+                    env=env,
+                    request=response.request,
+                    response=response,
+                    output_options=(
+                        args.output_options
+                        if response is final_response
+                        else args.output_options_history
+                    )
+                ),
+                # NOTE: `env.stdout` will in fact be `stderr` with `--download`
+                'outfile': env.stdout,
+                'flush': env.stdout_isatty or args.stream
+            }
+            try:
+                if env.is_windows and is_py3 and 'colors' in args.prettify:
+                    write_stream_with_colors_win_py3(**write_stream_kwargs)
+                else:
+                    write_stream(**write_stream_kwargs)
+            except IOError as e:
+                if not show_traceback and e.errno == errno.EPIPE:
+                    # Ignore broken pipes unless --traceback.
+                    env.stderr.write('\n')
+                else:
+                    raise
+
+        if downloader and exit_status == ExitStatus.OK:
+            # Last response body download.
+            download_stream, download_to = downloader.start(final_response)
+            write_stream(
+                stream=download_stream,
+                outfile=download_to,
+                flush=False,
+            )
+            downloader.finish()
+            if downloader.interrupted:
+                exit_status = ExitStatus.ERROR
+                log_error('Incomplete download: size=%d; downloaded=%d' % (
+                    downloader.status.total_size,
+                    downloader.status.downloaded
+                ))
+        return exit_status
+
+    finally:
+        if downloader and not downloader.finished:
+            downloader.failed()
+
+        if (not isinstance(args, list) and args.output_file and
+                args.output_file_specified):
+            args.output_file.close()
+
+
+def main(args=sys.argv[1:], env=Environment(), custom_log_error=None):
+    """
+    The main function.
+
+    Pre-process args, handle some special types of invocations,
+    and run the main program with error handling.
 
     Return exit status code.
 
@@ -76,118 +182,79 @@ def main(args=sys.argv[1:], env=Environment()):
     args = decode_args(args, env.stdin_encoding)
     plugin_manager.load_installed_plugins()
 
+    def log_error(msg, *args, **kwargs):
+        msg = msg % args
+        level = kwargs.get('level', 'error')
+        assert level in ['error', 'warning']
+        env.stderr.write('\nhttp: %s: %s\n' % (level, msg))
+
     from httpie.cli import parser
 
     if env.config.default_options:
         args = env.config.default_options + args
 
-    def error(msg, *args, **kwargs):
+    if custom_log_error:
-        msg = msg % args
+        log_error = custom_log_error
-        level = kwargs.get('level', 'error')
-        env.stderr.write('\nhttp: %s: %s\n' % (level, msg))
 
-    debug = '--debug' in args
+    include_debug_info = '--debug' in args
-    traceback = debug or '--traceback' in args
+    include_traceback = include_debug_info or '--traceback' in args
-    exit_status = ExitStatus.OK
 
-    if debug:
+    if include_debug_info:
         print_debug_info(env)
         if args == ['--debug']:
-            return exit_status
+            return ExitStatus.OK
 
-    download = None
+    exit_status = ExitStatus.OK
 
     try:
-        args = parser.parse_args(args=args, env=env)
+        parsed_args = parser.parse_args(args=args, env=env)
-
-        if args.download:
-            args.follow = True  # --download implies --follow.
-            download = Download(
-                output_file=args.output_file,
-                progress_file=env.stderr,
-                resume=args.download_resume
-            )
-            download.pre_request(args.headers)
-
-        response = get_response(args, config_dir=env.config.directory)
-
-        if args.check_status or download:
-
-            exit_status = get_exit_status(
-                http_status=response.status_code,
-                follow=args.follow
-            )
-
-            if not env.stdout_isatty and exit_status != ExitStatus.OK:
-                error('HTTP %s %s',
-                      response.raw.status,
-                      response.raw.reason,
-                      level='warning')
-
-        write_kwargs = {
-            'stream': build_output_stream(
-                args, env, response.request, response),
-
-            # This will in fact be `stderr` with `--download`
-            'outfile': env.stdout,
-
-            'flush': env.stdout_isatty or args.stream
-        }
-
-        try:
-
-            if env.is_windows and is_py3 and 'colors' in args.prettify:
-                write_with_colors_win_py3(**write_kwargs)
-            else:
-                write(**write_kwargs)
-
-            if download and exit_status == ExitStatus.OK:
-                # Response body download.
-                download_stream, download_to = download.start(response)
-                write(
-                    stream=download_stream,
-                    outfile=download_to,
-                    flush=False,
-                )
-                download.finish()
-                if download.interrupted:
-                    exit_status = ExitStatus.ERROR
-                    error('Incomplete download: size=%d; downloaded=%d' % (
-                        download.status.total_size,
-                        download.status.downloaded
-                    ))
-
-        except IOError as e:
-            if not traceback and e.errno == errno.EPIPE:
-                # Ignore broken pipes unless --traceback.
-                env.stderr.write('\n')
-            else:
-                raise
     except KeyboardInterrupt:
-        if traceback:
-            raise
         env.stderr.write('\n')
+        if include_traceback:
+            raise
         exit_status = ExitStatus.ERROR
     except SystemExit as e:
         if e.code != ExitStatus.OK:
-            if traceback:
-                raise
             env.stderr.write('\n')
+            if include_traceback:
+                raise
+            exit_status = ExitStatus.ERROR
+    else:
+        try:
+            exit_status = program(
+                args=parsed_args,
+                env=env,
+                log_error=log_error,
+            )
+        except KeyboardInterrupt:
+            env.stderr.write('\n')
+            if include_traceback:
+                raise
+            exit_status = ExitStatus.ERROR
+        except SystemExit as e:
+            if e.code != ExitStatus.OK:
+                env.stderr.write('\n')
+                if include_traceback:
+                    raise
+                exit_status = ExitStatus.ERROR
+        except requests.Timeout:
+            exit_status = ExitStatus.ERROR_TIMEOUT
+            log_error('Request timed out (%ss).', parsed_args.timeout)
+        except requests.TooManyRedirects:
+            exit_status = ExitStatus.ERROR_TOO_MANY_REDIRECTS
+            log_error('Too many redirects (--max-redirects=%s).',
+                  parsed_args.max_redirects)
+        except Exception as e:
+            # TODO: Further distinction between expected and unexpected errors.
+            msg = str(e)
+            if hasattr(e, 'request'):
+                request = e.request
+                if hasattr(request, 'url'):
+                    msg += ' while doing %s request to URL: %s' % (
+                        request.method, request.url)
+            log_error('%s: %s', type(e).__name__, msg)
+            if include_traceback:
+                raise
             exit_status = ExitStatus.ERROR
-    except requests.Timeout:
-        exit_status = ExitStatus.ERROR_TIMEOUT
-        error('Request timed out (%ss).', args.timeout)
-
-    except Exception as e:
-        # TODO: Better distinction between expected and unexpected errors.
-        #       Network errors vs. bugs, etc.
-        if traceback:
-            raise
-        error('%s: %s', type(e).__name__, str(e))
-        exit_status = ExitStatus.ERROR
-
-    finally:
-        if download and not download.finished:
-            download.failed()
 
     return exit_status

httpie/downloads.py

@@ -7,6 +7,7 @@ from __future__ import division
 import os
 import re
 import sys
+import errno
 import mimetypes
 import threading
 from time import sleep, time
@@ -104,7 +105,7 @@ def filename_from_content_disposition(content_disposition):
     :return: the filename if present and valid, otherwise `None`
 
     """
-    # attachment; filename=jakubroztocil-httpie-0.4.1-20-g40bd8f6.tar.gz
+    # attachment; filename=jkbrzt-httpie-0.4.1-20-g40bd8f6.tar.gz
 
     msg = Message('Content-Disposition: %s' % content_disposition)
     filename = msg.get_filename()
@@ -135,16 +136,51 @@ def filename_from_url(url, content_type):
     return fn
 
 
+def trim_filename(filename, max_len):
+    if len(filename) > max_len:
+        trim_by = len(filename) - max_len
+        name, ext = os.path.splitext(filename)
+        if trim_by >= len(name):
+            filename = filename[:-trim_by]
+        else:
+            filename = name[:-trim_by] + ext
+    return filename
+
+
+def get_filename_max_length(directory):
+    max_len = 255
+    try:
+        pathconf = os.pathconf
+    except AttributeError:
+        pass  # non-posix
+    else:
+        try:
+            max_len = pathconf(directory, 'PC_NAME_MAX')
+        except OSError as e:
+            if e.errno != errno.EINVAL:
+                raise
+    return max_len
+
+
+def trim_filename_if_needed(filename, directory='.', extra=0):
+    max_len = get_filename_max_length(directory) - extra
+    if len(filename) > max_len:
+        filename = trim_filename(filename, max_len)
+    return filename
+
+
 def get_unique_filename(filename, exists=os.path.exists):
     attempt = 0
     while True:
         suffix = '-' + str(attempt) if attempt > 0 else ''
-        if not exists(filename + suffix):
+        try_filename = trim_filename_if_needed(filename, extra=len(suffix))
-            return filename + suffix
+        try_filename += suffix
+        if not exists(try_filename):
+            return try_filename
         attempt += 1
 
 
-class Download(object):
+class Downloader(object):
 
     def __init__(self, output_file=None,
                  resume=False, progress_file=sys.stderr):
@@ -178,8 +214,8 @@ class Download(object):
         :type request_headers: dict
 
         """
-        # Disable content encoding so that we can resume, etc.
+        # Ask the server not to encode the content so that we can resume, etc.
-        request_headers['Accept-Encoding'] = None
+        request_headers['Accept-Encoding'] = 'identity'
         if self._resume:
             bytes_have = os.path.getsize(self._output_file.name)
             if bytes_have:
@@ -201,6 +237,8 @@ class Download(object):
         """
         assert not self.status.time_started
 
+        # FIXME: some servers still might sent Content-Encoding: gzip
+        # <https://github.com/jkbrzt/httpie/issues/423>
         try:
             total_size = int(response.headers['Content-Length'])
         except (KeyError, ValueError, TypeError):
@@ -299,8 +337,7 @@ class Status(object):
 
     def started(self, resumed_from=0, total_size=None):
         assert self.time_started is None
-        if total_size is not None:
+        self.total_size = total_size
-            self.total_size = total_size
         self.downloaded = self.resumed_from = resumed_from
         self.time_started = time()
 

httpie/input.py

@@ -2,6 +2,7 @@
 
 """
 import os
+import ssl
 import sys
 import re
 import errno
@@ -13,7 +14,7 @@ from collections import namedtuple, Iterable
 from argparse import ArgumentParser, ArgumentTypeError, ArgumentError
 
 # TODO: Use MultiDict for headers once added to `requests`.
-# https://github.com/jakubroztocil/httpie/issues/130
+# https://github.com/jkbrzt/httpie/issues/130
 from requests.structures import CaseInsensitiveDict
 
 from httpie.compat import OrderedDict, urlsplit, str, is_pypy, is_py27
@@ -103,7 +104,21 @@ OUTPUT_OPTIONS_DEFAULT = OUT_RESP_HEAD + OUT_RESP_BODY
 OUTPUT_OPTIONS_DEFAULT_STDOUT_REDIRECTED = OUT_RESP_BODY
 
 
-class Parser(ArgumentParser):
+SSL_VERSION_ARG_MAPPING = {
+    'ssl2.3': 'PROTOCOL_SSLv23',
+    'ssl3': 'PROTOCOL_SSLv3',
+    'tls1': 'PROTOCOL_TLSv1',
+    'tls1.1': 'PROTOCOL_TLSv1_1',
+    'tls1.2': 'PROTOCOL_TLSv1_2',
+}
+SSL_VERSION_ARG_MAPPING = dict(
+    (cli_arg, getattr(ssl, ssl_constant))
+    for cli_arg, ssl_constant in SSL_VERSION_ARG_MAPPING.items()
+    if hasattr(ssl, ssl_constant)
+)
+
+
+class HTTPieArgumentParser(ArgumentParser):
     """Adds additional logic to `argparse.ArgumentParser`.
 
     Handles all input (CLI args, file args, stdin), applies defaults,
@@ -113,13 +128,13 @@ class Parser(ArgumentParser):
 
     def __init__(self, *args, **kwargs):
         kwargs['add_help'] = False
-        super(Parser, self).__init__(*args, **kwargs)
+        super(HTTPieArgumentParser, self).__init__(*args, **kwargs)
 
     # noinspection PyMethodOverriding
     def parse_args(self, env, args=None, namespace=None):
 
         self.env = env
-        self.args, no_options = super(Parser, self)\
+        self.args, no_options = super(HTTPieArgumentParser, self)\
             .parse_known_args(args, namespace)
 
         if self.args.debug:
@@ -127,7 +142,6 @@ class Parser(ArgumentParser):
 
         # Arguments processing and environment setup.
         self._apply_no_options(no_options)
-        self._apply_config()
         self._validate_download_options()
         self._setup_standard_streams()
         self._process_output_options()
@@ -164,19 +178,17 @@ class Parser(ArgumentParser):
         }.get(file, file)
         if not hasattr(file, 'buffer') and isinstance(message, str):
             message = message.encode(self.env.stdout_encoding)
-        super(Parser, self)._print_message(message, file)
+        super(HTTPieArgumentParser, self)._print_message(message, file)
 
     def _setup_standard_streams(self):
         """
         Modify `env.stdout` and `env.stdout_isatty` based on args, if needed.
 
         """
-        if not self.env.stdout_isatty and self.args.output_file:
+        self.args.output_file_specified = bool(self.args.output_file)
-            self.error('Cannot use --output, -o with redirected output.')
-
         if self.args.download:
             # FIXME: Come up with a cleaner solution.
-            if not self.env.stdout_isatty:
+            if not self.args.output_file and not self.env.stdout_isatty:
                 # Use stdout as the download output file.
                 self.args.output_file = self.env.stdout
             # With `--download`, we write everything that would normally go to
@@ -201,11 +213,6 @@ class Parser(ArgumentParser):
             self.env.stdout = self.args.output_file
             self.env.stdout_isatty = False
 
-    def _apply_config(self):
-        if (not self.args.json
-                and self.env.config.implicit_content_type == 'form'):
-            self.args.form = True
-
     def _process_auth(self):
         """
         If only a username provided via --auth, then ask for a password.
@@ -303,8 +310,8 @@ class Parser(ArgumentParser):
                 # Infer the method
                 has_data = (
                     (not self.args.ignore_stdin and not self.env.stdin_isatty)
-                     or any(item.sep in SEP_GROUP_DATA_ITEMS
+                    or any(item.sep in SEP_GROUP_DATA_ITEMS
-                            for item in self.args.items)
+                           for item in self.args.items)
                 )
                 self.args.method = HTTP_POST if has_data else HTTP_GET
 
@@ -336,17 +343,14 @@ class Parser(ArgumentParser):
                     'Invalid file fields (perhaps you meant --form?): %s'
                     % ','.join(file_fields))
 
-            fn, fd = self.args.files['']
+            fn, fd, ct = self.args.files['']
             self.args.files = {}
 
             self._body_from_file(fd)
 
             if 'Content-Type' not in self.args.headers:
-                mime, encoding = mimetypes.guess_type(fn, strict=False)
+                content_type = get_content_type(fn)
-                if mime:
+                if content_type:
-                    content_type = mime
-                    if encoding:
-                        content_type = '%s; charset=%s' % (mime, encoding)
                     self.args.headers['Content-Type'] = content_type
 
     def _process_output_options(self):
@@ -355,18 +359,32 @@ class Parser(ArgumentParser):
         The default output options are stdout-type-sensitive.
 
         """
-        if not self.args.output_options:
+        def check_options(value, option):
-            self.args.output_options = (
+            unknown = set(value) - OUTPUT_OPTIONS
-                OUTPUT_OPTIONS_DEFAULT
+            if unknown:
-                if self.env.stdout_isatty
+                self.error('Unknown output options: {0}={1}'.format(
-                else OUTPUT_OPTIONS_DEFAULT_STDOUT_REDIRECTED
+                    option,
-            )
+                    ','.join(unknown)
+                ))
 
-        unknown_output_options = set(self.args.output_options) - OUTPUT_OPTIONS
+        if self.args.verbose:
-        if unknown_output_options:
+            self.args.all = True
-            self.error(
+
-                'Unknown output options: %s' % ','.join(unknown_output_options)
+        if self.args.output_options is None:
-            )
+            if self.args.verbose:
+                self.args.output_options = ''.join(OUTPUT_OPTIONS)
+            else:
+                self.args.output_options = (
+                    OUTPUT_OPTIONS_DEFAULT
+                    if self.env.stdout_isatty
+                    else OUTPUT_OPTIONS_DEFAULT_STDOUT_REDIRECTED
+                )
+
+        if self.args.output_options_history is None:
+            self.args.output_options_history = self.args.output_options
+
+        check_options(self.args.output_options, '--print')
+        check_options(self.args.output_options_history, '--history-print')
 
         if self.args.download and OUT_RESP_BODY in self.args.output_options:
             # Response body is always downloaded with --download and it goes
@@ -378,7 +396,8 @@ class Parser(ArgumentParser):
         if self.args.prettify == PRETTY_STDOUT_TTY_ONLY:
             self.args.prettify = PRETTY_MAP[
                 'all' if self.env.stdout_isatty else 'none']
-        elif self.args.prettify and self.env.is_windows:
+        elif (self.args.prettify and self.env.is_windows and
+              self.args.output_file):
             self.error('Only terminal output can be colorized on Windows.')
         else:
             # noinspection PyTypeChecker
@@ -521,7 +540,7 @@ class AuthCredentials(KeyValue):
 
     def _getpass(self, prompt):
         # To allow mocking.
-        return getpass.getpass(prompt)
+        return getpass.getpass(str(prompt))
 
     def has_password(self):
         return self.value is not None
@@ -572,7 +591,7 @@ class RequestItemsDict(OrderedDict):
             else:
                 super(RequestItemsDict, self).__init__(*args, **kwargs)
 
-    #noinspection PyMethodOverriding
+    # noinspection PyMethodOverriding
     def __setitem__(self, key, value):
         """ If `key` is assigned more than once, `self[key]` holds a
         `list` of all the values.
@@ -608,6 +627,21 @@ RequestItems = namedtuple('RequestItems',
                           ['headers', 'data', 'files', 'params'])
 
 
+def get_content_type(filename):
+    """
+    Return the content type for ``filename`` in format appropriate
+    for Content-Type headers, or ``None`` if the file type is unknown
+    to ``mimetypes``.
+
+    """
+    mime, encoding = mimetypes.guess_type(filename, strict=False)
+    if mime:
+        content_type = mime
+        if encoding:
+            content_type = '%s; charset=%s' % (mime, encoding)
+        return content_type
+
+
 def parse_items(items,
                 headers_class=CaseInsensitiveDict,
                 data_class=OrderedDict,
@@ -633,7 +667,8 @@ def parse_items(items,
             try:
                 with open(os.path.expanduser(value), 'rb') as f:
                     value = (os.path.basename(value),
-                             BytesIO(f.read()))
+                             BytesIO(f.read()),
+                             get_content_type(value))
             except IOError as e:
                 raise ParseError('"%s": %s' % (item.orig, e))
             target = files

httpie/models.py

@@ -48,7 +48,7 @@ class HTTPResponse(HTTPMessage):
     def iter_lines(self, chunk_size):
         return ((line, b'\n') for line in self._orig.iter_lines(chunk_size))
 
-    #noinspection PyProtectedMember
+    # noinspection PyProtectedMember
     @property
     def headers(self):
         original = self._orig.raw._original_response

httpie/output/formatters/colors.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+import json
+
 import pygments.lexer
 import pygments.token
 import pygments.styles
@@ -5,16 +8,22 @@ import pygments.lexers
 import pygments.style
 from pygments.formatters.terminal import TerminalFormatter
 from pygments.formatters.terminal256 import Terminal256Formatter
+from pygments.lexers.special import TextLexer
 from pygments.util import ClassNotFound
 
+from httpie.compat import is_windows
 from httpie.plugins import FormatterPlugin
 
 
-# Colors on Windows via colorama don't look that
-# great and fruity seems to give the best result there.
 AVAILABLE_STYLES = set(pygments.styles.STYLE_MAP.keys())
 AVAILABLE_STYLES.add('solarized')
-DEFAULT_STYLE = 'solarized'
+
+if is_windows:
+    # Colors on Windows via colorama don't look that
+    # great and fruity seems to give the best result there
+    DEFAULT_STYLE = 'fruity'
+else:
+    DEFAULT_STYLE = 'solarized'
 
 
 class ColorFormatter(FormatterPlugin):
@@ -27,14 +36,15 @@ class ColorFormatter(FormatterPlugin):
     """
     group_name = 'colors'
 
-    def __init__(self, env, color_scheme=DEFAULT_STYLE, **kwargs):
+    def __init__(self, env, explicit_json=False,
+                 color_scheme=DEFAULT_STYLE, **kwargs):
         super(ColorFormatter, self).__init__(**kwargs)
         if not env.colors:
             self.enabled = False
             return
 
-        # Cache to speed things up when we process streamed body by line.
+        # --json, -j
-        self.lexer_cache = {}
+        self.explicit_json = explicit_json
 
         try:
             style_class = pygments.styles.get_style_by_name(color_scheme)
@@ -51,34 +61,40 @@ class ColorFormatter(FormatterPlugin):
         return pygments.highlight(headers, HTTPLexer(), self.formatter).strip()
 
     def format_body(self, body, mime):
-        lexer = self.get_lexer(mime)
+        lexer = self.get_lexer(mime, body)
         if lexer:
             body = pygments.highlight(body, lexer, self.formatter)
         return body.strip()
 
-    def get_lexer(self, mime):
+    def get_lexer(self, mime, body):
-        if mime in self.lexer_cache:
+        return get_lexer(
-            return self.lexer_cache[mime]
+            mime=mime,
-        self.lexer_cache[mime] = get_lexer(mime)
+            explicit_json=self.explicit_json,
-        return self.lexer_cache[mime]
+            body=body,
+        )
 
 
-def get_lexer(mime):
+def get_lexer(mime, explicit_json=False, body=''):
+
+    # Build candidate mime type and lexer names.
     mime_types, lexer_names = [mime], []
-    type_, subtype = mime.split('/')
+    type_, subtype = mime.split('/', 1)
     if '+' not in subtype:
         lexer_names.append(subtype)
     else:
-        subtype_name, subtype_suffix = subtype.split('+')
+        subtype_name, subtype_suffix = subtype.split('+', 1)
         lexer_names.extend([subtype_name, subtype_suffix])
         mime_types.extend([
             '%s/%s' % (type_, subtype_name),
             '%s/%s' % (type_, subtype_suffix)
         ])
-    # as a last resort, if no lexer feels responsible, and
+
+    # As a last resort, if no lexer feels responsible, and
     # the subtype contains 'json', take the JSON lexer
     if 'json' in subtype:
         lexer_names.append('json')
+
+    # Try to resolve the right lexer.
     lexer = None
     for mime_type in mime_types:
         try:
@@ -92,6 +108,16 @@ def get_lexer(mime):
                 lexer = pygments.lexers.get_lexer_by_name(name)
             except ClassNotFound:
                 pass
+
+    if explicit_json and body and (not lexer or isinstance(lexer, TextLexer)):
+        # JSON response with an incorrect Content-Type?
+        try:
+            json.loads(body)  # FIXME: the body also gets parsed in json.py
+        except ValueError:
+            pass  # Nope
+        else:
+            lexer = pygments.lexers.get_lexer_by_name('json')
+
     return lexer
 
 
@@ -143,8 +169,6 @@ class HTTPLexer(pygments.lexer.RegexLexer):
     }
 
 
-# TODO: As Solarized is not the default theme any longer, it should be removed
-#       or bundled directly with Pygments so that we don't need to support it.
 class Solarized256Style(pygments.style.Style):
     """
     solarized256

httpie/output/formatters/json.py

@@ -10,17 +10,24 @@ DEFAULT_INDENT = 4
 class JSONFormatter(FormatterPlugin):
 
     def format_body(self, body, mime):
-        if 'json' in mime:
+        maybe_json = [
+            'json',
+            'javascript',
+            'text',
+        ]
+        if (self.kwargs['explicit_json'] or
+                any(token in mime for token in maybe_json)):
             try:
                 obj = json.loads(body)
             except ValueError:
-                # Invalid JSON, ignore.
+                pass  # Invalid JSON, ignore.
-                pass
             else:
                 # Indent, sort keys by name, and avoid
                 # unicode escapes to improve readability.
-                body = json.dumps(obj,
+                body = json.dumps(
-                                  sort_keys=True,
+                    obj=obj,
-                                  ensure_ascii=False,
+                    sort_keys=True,
-                                  indent=DEFAULT_INDENT)
+                    ensure_ascii=False,
+                    indent=DEFAULT_INDENT
+                )
         return body

httpie/output/formatters/xml.py

@@ -1,61 +0,0 @@
-from __future__ import absolute_import
-import re
-from xml.etree import ElementTree
-
-from httpie.plugins import FormatterPlugin
-
-
-DECLARATION_RE = re.compile('<\?xml[^\n]+?\?>', flags=re.I)
-DOCTYPE_RE = re.compile('<!DOCTYPE[^\n]+?>', flags=re.I)
-
-
-DEFAULT_INDENT = 4
-
-
-def indent(elem, indent_text=' ' * DEFAULT_INDENT):
-    """
-    In-place prettyprint formatter
-    C.f. http://effbot.org/zone/element-lib.htm#prettyprint
-
-    """
-    def _indent(elem, level=0):
-        i = "\n" + level * indent_text
-        if len(elem):
-            if not elem.text or not elem.text.strip():
-                elem.text = i + indent_text
-            if not elem.tail or not elem.tail.strip():
-                elem.tail = i
-            for elem in elem:
-                _indent(elem, level + 1)
-            if not elem.tail or not elem.tail.strip():
-                elem.tail = i
-        else:
-            if level and (not elem.tail or not elem.tail.strip()):
-                elem.tail = i
-
-    return _indent(elem)
-
-
-class XMLFormatter(FormatterPlugin):
-    # TODO: tests
-
-    def format_body(self, body, mime):
-        if 'xml' in mime:
-            # FIXME: orig NS names get forgotten during the conversion, etc.
-            try:
-                root = ElementTree.fromstring(body.encode('utf8'))
-            except ElementTree.ParseError:
-                # Ignore invalid XML errors (skips attempting to pretty print)
-                pass
-            else:
-                indent(root)
-                # Use the original declaration
-                declaration = DECLARATION_RE.match(body)
-                doctype = DOCTYPE_RE.match(body)
-                body = ElementTree.tostring(root, encoding='utf-8')\
-                                  .decode('utf8')
-                if doctype:
-                    body = '%s\n%s' % (doctype.group(0), body)
-                if declaration:
-                    body = '%s\n%s' % (declaration.group(0), body)
-        return body

httpie/output/streams.py

@@ -24,7 +24,7 @@ class BinarySuppressedError(Exception):
     message = BINARY_SUPPRESSED_NOTICE
 
 
-def write(stream, outfile, flush):
+def write_stream(stream, outfile, flush):
     """Write the output stream."""
     try:
         # Writing bytes so we use the buffer interface (Python 3).
@@ -38,7 +38,7 @@ def write(stream, outfile, flush):
             outfile.flush()
 
 
-def write_with_colors_win_py3(stream, outfile, flush):
+def write_stream_with_colors_win_py3(stream, outfile, flush):
     """Like `write`, but colorized chunks are written as text
     directly to `outfile` to ensure it gets processed by colorama.
     Applies only to Windows with Python 3 and colorized terminal output.
@@ -55,15 +55,15 @@ def write_with_colors_win_py3(stream, outfile, flush):
             outfile.flush()
 
 
-def build_output_stream(args, env, request, response):
+def build_output_stream(args, env, request, response, output_options):
     """Build and return a chain of iterators over the `request`-`response`
     exchange each of which yields `bytes` chunks.
 
     """
-    req_h = OUT_REQ_HEAD in args.output_options
+    req_h = OUT_REQ_HEAD in output_options
-    req_b = OUT_REQ_BODY in args.output_options
+    req_b = OUT_REQ_BODY in output_options
-    resp_h = OUT_RESP_HEAD in args.output_options
+    resp_h = OUT_RESP_HEAD in output_options
-    resp_b = OUT_RESP_BODY in args.output_options
+    resp_b = OUT_RESP_BODY in output_options
     req = req_h or req_b
     resp = resp_h or resp_b
 
@@ -112,8 +112,12 @@ def get_stream_type(env, args):
             PrettyStream if args.stream else BufferedPrettyStream,
             env=env,
             conversion=Conversion(),
-            formatting=Formatting(env=env, groups=args.prettify,
+            formatting=Formatting(
-                                  color_scheme=args.style),
+                env=env,
+                groups=args.prettify,
+                color_scheme=args.style,
+                explicit_json=args.json,
+            ),
         )
     else:
         Stream = partial(EncodedStream, env=env)

httpie/plugins/__init__.py

@@ -11,7 +11,6 @@ from httpie.plugins.manager import PluginManager
 from httpie.plugins.builtin import BasicAuthPlugin, DigestAuthPlugin
 from httpie.output.formatters.headers import HeadersFormatter
 from httpie.output.formatters.json import JSONFormatter
-from httpie.output.formatters.xml import XMLFormatter
 from httpie.output.formatters.colors import ColorFormatter
 
 
@@ -20,5 +19,4 @@ plugin_manager.register(BasicAuthPlugin,
                         DigestAuthPlugin)
 plugin_manager.register(HeadersFormatter,
                         JSONFormatter,
-                        XMLFormatter,
                         ColorFormatter)

httpie/plugins/base.py

@@ -15,7 +15,7 @@ class AuthPlugin(BasePlugin):
     """
     Base auth plugin class.
 
-    See <https://github.com/jakubroztocil/httpie-ntlm> for an example auth plugin.
+    See <https://github.com/jkbrzt/httpie-ntlm> for an example auth plugin.
 
     """
     # The value that should be passed to --auth-type

httpie/plugins/builtin.py

@@ -16,7 +16,7 @@ class HTTPBasicAuth(requests.auth.HTTPBasicAuth):
         """
         Override username/password serialization to allow unicode.
 
-        See https://github.com/jakubroztocil/httpie/issues/212
+        See https://github.com/jkbrzt/httpie/issues/212
 
         """
         r.headers['Authorization'] = type(self).make_header(

httpie/plugins/manager.py

@@ -60,6 +60,6 @@ class PluginManager(object):
                 if issubclass(plugin, ConverterPlugin)]
 
     # Adapters
-    def get_trasnsport_plugins(self):
+    def get_transport_plugins(self):
         return [plugin for plugin in self
                 if issubclass(plugin, TransportPlugin)]

httpie/sessions.py

@@ -22,7 +22,7 @@ SESSION_IGNORED_HEADER_PREFIXES = ['Content-', 'If-']
 
 def get_response(requests_session, session_name,
                  config_dir, args, read_only=False):
-    """Like `client.get_response`, but applies permanent
+    """Like `client.get_responses`, but applies permanent
     aspects of the session to the request.
 
     """
@@ -30,8 +30,8 @@ def get_response(requests_session, session_name,
     if os.path.sep in session_name:
         path = os.path.expanduser(session_name)
     else:
-        hostname = (args.headers.get('Host', None)
+        hostname = (args.headers.get('Host', None) or
-                    or urlsplit(args.url).netloc.split('@')[-1])
+                    urlsplit(args.url).netloc.split('@')[-1])
         if not hostname:
             # HACK/FIXME: httpie-unixsocket's URLs have no hostname.
             hostname = 'localhost'
@@ -75,7 +75,7 @@ def get_response(requests_session, session_name,
 
 
 class Session(BaseConfigDict):
-    helpurl = 'https://github.com/jakubroztocil/httpie#sessions'
+    helpurl = 'https://github.com/jkbrzt/httpie#sessions'
     about = 'HTTPie session file'
 
     def __init__(self, path, *args, **kwargs):
@@ -101,6 +101,10 @@ class Session(BaseConfigDict):
 
         """
         for name, value in request_headers.items():
+
+            if value is None:
+                continue  # Ignore explicitely unset headers
+
             value = value.decode('utf8')
             if name == 'User-Agent' and value.startswith('HTTPie/'):
                 continue

httpie/utils.py

@@ -10,6 +10,22 @@ def load_json_preserve_order(s):
     return json.loads(s, object_pairs_hook=OrderedDict)
 
 
+def repr_dict_nice(d):
+    def prepare_dict(d):
+        for k, v in d.items():
+            if isinstance(v, dict):
+                v = dict(prepare_dict(v))
+            elif isinstance(v, bytes):
+                v = v.decode('utf8')
+            elif not isinstance(v, (int, str)):
+                v = repr(v)
+            yield k, v
+    return json.dumps(
+        dict(prepare_dict(d)),
+        indent=4, sort_keys=True,
+    )
+
+
 def humanize_bytes(n, precision=2):
     # Author: Doug Latornell
     # Licence: MIT
@@ -54,4 +70,3 @@ def humanize_bytes(n, precision=2):
 
     # noinspection PyUnboundLocalVariable
     return '%.*f %s' % (precision, n / factor, suffix)
-

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs = tests/fixtures

requirements-dev.txt

@@ -1,6 +1,7 @@
 tox
+mock
 pytest
 pytest-cov
-pytest-httpbin
+pytest-httpbin>=0.0.6
 docutils
 wheel

setup.py

@@ -14,7 +14,6 @@ class PyTest(TestCommand):
     # and runs the tests with no fancy stuff like parallel execution.
     def finalize_options(self):
         TestCommand.finalize_options(self)
-        self.test_suite = True
         self.test_args = [
             '--doctest-modules', '--verbose',
             './httpie', './tests'
@@ -31,6 +30,7 @@ tests_require = [
     # https://bitbucket.org/pypa/setuptools/issue/196/
     'pytest-httpbin',
     'pytest',
+    'mock',
 ]
 
 
@@ -39,12 +39,12 @@ install_requires = [
     'Pygments>=1.5'
 ]
 
-### Conditional dependencies:
+# Conditional dependencies:
 
 # sdist
-if not 'bdist_wheel' in sys.argv:
+if 'bdist_wheel' not in sys.argv:
     try:
-        #noinspection PyUnresolvedReferences
+        # noinspection PyUnresolvedReferences
         import argparse
     except ImportError:
         install_requires.append('argparse>=1.2.1')
@@ -56,7 +56,7 @@ if not 'bdist_wheel' in sys.argv:
 
 # bdist_wheel
 extras_require = {
-    # http://wheel.readthedocs.org/en/latest/#defining-conditional-dependencies
+    # http://wheel.readthedocs.io/en/latest/#defining-conditional-dependencies
     ':python_version == "2.6"'
     ' or python_version == "3.0"'
     ' or python_version == "3.1" ': ['argparse>=1.2.1'],
@@ -74,9 +74,9 @@ setup(
     description=httpie.__doc__.strip(),
     long_description=long_description(),
     url='http://httpie.org/',
-    download_url='https://github.com/jakubroztocil/httpie',
+    download_url='https://github.com/jkbrzt/httpie',
     author=httpie.__author__,
-    author_email='jakub@roztocil.name',
+    author_email='jakub@roztocil.co',
     license=httpie.__licence__,
     packages=find_packages(),
     entry_points={

tests/README.rst

@@ -5,4 +5,4 @@ HTTPie Test Suite
 Please see `CONTRIBUTING`_.
 
 
-.. _CONTRIBUTING: https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst
+.. _CONTRIBUTING: https://github.com/jkbrzt/httpie/blob/master/CONTRIBUTING.rst

tests/conftest.py

@@ -0,0 +1,14 @@
+import pytest
+from pytest_httpbin.plugin import httpbin_ca_bundle
+
+
+# Make httpbin's CA trusted by default
+pytest.fixture(autouse=True)(httpbin_ca_bundle)
+
+
+@pytest.fixture(scope='function')
+def httpbin_secure_untrusted(monkeypatch, httpbin_secure):
+    """Like the `httpbin_secure` fixture, but without the
+    make-CA-trusted-by-default"""
+    monkeypatch.delenv('REQUESTS_CA_BUNDLE')
+    return httpbin_secure

tests/fixtures/__init__.py

@@ -12,7 +12,7 @@ def patharg(path):
     return path.replace('\\', '\\\\\\')
 
 
-FIXTURES_ROOT = path.join(path.abspath(path.dirname(__file__)), 'fixtures')
+FIXTURES_ROOT = path.join(path.abspath(path.dirname(__file__)))
 FILE_PATH = path.join(FIXTURES_ROOT, 'test.txt')
 JSON_FILE_PATH = path.join(FIXTURES_ROOT, 'test.json')
 BIN_FILE_PATH = path.join(FIXTURES_ROOT, 'test.bin')
@@ -38,4 +38,3 @@ with open(BIN_FILE_PATH, 'rb') as f:
     BIN_FILE_CONTENT = f.read()
 
 UNICODE = FILE_CONTENT
-

tests/test_auth.py

@@ -1,5 +1,5 @@
 """HTTP authentication-related tests."""
-import requests
+import mock
 import pytest
 
 from utils import http, add_auth, HTTP_OK, TestEnvironment
@@ -7,56 +7,58 @@ import httpie.input
 import httpie.cli
 
 
-class TestAuth:
+def test_basic_auth(httpbin_both):
-    def test_basic_auth(self, httpbin):
+    r = http('--auth=user:password',
-        r = http('--auth=user:password',
+             'GET', httpbin_both + '/basic-auth/user/password')
-                 'GET', httpbin.url + '/basic-auth/user/password')
+    assert HTTP_OK in r
-        assert HTTP_OK in r
+    assert r.json == {'authenticated': True, 'user': 'user'}
-        assert r.json == {'authenticated': True, 'user': 'user'}
 
-    @pytest.mark.skipif(
-        requests.__version__ == '0.13.6',
-        reason='Redirects with prefetch=False are broken in Requests 0.13.6')
-    def test_digest_auth(self, httpbin):
-        r = http('--auth-type=digest', '--auth=user:password',
-                 'GET', httpbin.url + '/digest-auth/auth/user/password')
-        assert HTTP_OK in r
-        assert r.json == {'authenticated': True, 'user': 'user'}
 
-    def test_password_prompt(self, httpbin):
+@pytest.mark.parametrize('argument_name', ['--auth-type', '-A'])
-        httpie.input.AuthCredentials._getpass = lambda self, prompt: 'password'
+def test_digest_auth(httpbin_both, argument_name):
-        r = http('--auth', 'user',
+    r = http(argument_name + '=digest', '--auth=user:password',
-                 'GET', httpbin.url + '/basic-auth/user/password')
+             'GET', httpbin_both.url + '/digest-auth/auth/user/password')
-        assert HTTP_OK in r
+    assert HTTP_OK in r
-        assert r.json == {'authenticated': True, 'user': 'user'}
+    assert r.json == {'authenticated': True, 'user': 'user'}
 
-    def test_credentials_in_url(self, httpbin):
-        url = add_auth(httpbin.url + '/basic-auth/user/password',
-                       auth='user:password')
-        r = http('GET', url)
-        assert HTTP_OK in r
-        assert r.json == {'authenticated': True, 'user': 'user'}
 
-    def test_credentials_in_url_auth_flag_has_priority(self, httpbin):
+@mock.patch('httpie.input.AuthCredentials._getpass',
-        """When credentials are passed in URL and via -a at the same time,
+            new=lambda self, prompt: 'password')
-         then the ones from -a are used."""
+def test_password_prompt(httpbin):
-        url = add_auth(httpbin.url + '/basic-auth/user/password',
+    r = http('--auth', 'user',
-                       auth='user:wrong')
+             'GET', httpbin.url + '/basic-auth/user/password')
-        r = http('--auth=user:password', 'GET', url)
+    assert HTTP_OK in r
-        assert HTTP_OK in r
+    assert r.json == {'authenticated': True, 'user': 'user'}
-        assert r.json == {'authenticated': True, 'user': 'user'}
 
-    @pytest.mark.parametrize('url', [
-        'username@example.org',
-        'username:@example.org',
-    ])
-    def test_only_username_in_url(self, url):
-        """
-        https://github.com/jakubroztocil/httpie/issues/242
 
-        """
+def test_credentials_in_url(httpbin_both):
-        args = httpie.cli.parser.parse_args(args=[url], env=TestEnvironment())
+    url = add_auth(httpbin_both.url + '/basic-auth/user/password',
-        assert args.auth
+                   auth='user:password')
-        assert args.auth.key == 'username'
+    r = http('GET', url)
-        assert args.auth.value == ''
+    assert HTTP_OK in r
+    assert r.json == {'authenticated': True, 'user': 'user'}
 
+
+def test_credentials_in_url_auth_flag_has_priority(httpbin_both):
+    """When credentials are passed in URL and via -a at the same time,
+     then the ones from -a are used."""
+    url = add_auth(httpbin_both.url + '/basic-auth/user/password',
+                   auth='user:wrong')
+    r = http('--auth=user:password', 'GET', url)
+    assert HTTP_OK in r
+    assert r.json == {'authenticated': True, 'user': 'user'}
+
+
+@pytest.mark.parametrize('url', [
+    'username@example.org',
+    'username:@example.org',
+])
+def test_only_username_in_url(url):
+    """
+    https://github.com/jkbrzt/httpie/issues/242
+
+    """
+    args = httpie.cli.parser.parse_args(args=[url], env=TestEnvironment())
+    assert args.auth
+    assert args.auth.key == 'username'
+    assert args.auth.value == ''

tests/test_binary.py

@@ -6,6 +6,7 @@ from fixtures import BIN_FILE_PATH, BIN_FILE_CONTENT, BIN_FILE_PATH_ARG
 
 
 class TestBinaryRequestData:
+
     def test_binary_stdin(self, httpbin):
         with open(BIN_FILE_PATH, 'rb') as stdin:
             env = TestEnvironment(

tests/test_cli.py

@@ -154,7 +154,7 @@ class TestQuerystring:
         assert '"url": "%s"' % url in r
 
 
-class TestURLshorthand:
+class TestLocalhostShorthand:
     def test_expand_localhost_shorthand(self):
         args = parser.parse_args(args=[':'], env=TestEnvironment())
         assert args.url == 'http://localhost'
@@ -201,7 +201,7 @@ class TestURLshorthand:
 class TestArgumentParser:
 
     def setup_method(self, method):
-        self.parser = input.Parser()
+        self.parser = input.HTTPieArgumentParser()
 
     def test_guess_when_method_set_and_valid(self):
         self.parser.args = argparse.Namespace()

tests/test_config.py

@@ -0,0 +1,33 @@
+from utils import TestEnvironment, http
+
+
+def test_default_options(httpbin):
+    env = TestEnvironment()
+    env.config['default_options'] = ['--form']
+    env.config.save()
+    r = http(httpbin.url + '/post', 'foo=bar', env=env)
+    assert r.json['form'] == {"foo": "bar"}
+
+
+def test_default_options_overwrite(httpbin):
+    env = TestEnvironment()
+    env.config['default_options'] = ['--form']
+    env.config.save()
+    r = http('--json', httpbin.url + '/post', 'foo=bar', env=env)
+    assert r.json['json'] == {"foo": "bar"}
+
+
+def test_migrate_implicit_content_type():
+    config = TestEnvironment().config
+
+    config['implicit_content_type'] = 'json'
+    config.save()
+    config.load()
+    assert 'implicit_content_type' not in config
+    assert not config['default_options']
+
+    config['implicit_content_type'] = 'form'
+    config.save()
+    config.load()
+    assert 'implicit_content_type' not in config
+    assert config['default_options'] == ['--form']

tests/test_defaults.py

@@ -2,7 +2,7 @@
 Tests for the provided defaults regarding HTTP method, and --json vs. --form.
 
 """
-from utils import TestEnvironment, http, HTTP_OK, no_content_type
+from utils import TestEnvironment, http, HTTP_OK
 from fixtures import FILE_PATH
 
 
@@ -42,11 +42,11 @@ class TestAutoContentTypeAndAcceptHeaders:
     """
 
     def test_GET_no_data_no_auto_headers(self, httpbin):
-        # https://github.com/jakubroztocil/httpie/issues/62
+        # https://github.com/jkbrzt/httpie/issues/62
         r = http('GET', httpbin.url + '/headers')
         assert HTTP_OK in r
         assert r.json['headers']['Accept'] == '*/*'
-        assert no_content_type(r.json['headers'])
+        assert 'Content-Type' not in r.json['headers']
 
     def test_POST_no_data_no_auto_headers(self, httpbin):
         # JSON headers shouldn't be automatically set for POST with no data.
@@ -73,7 +73,7 @@ class TestAutoContentTypeAndAcceptHeaders:
         assert HTTP_OK in r
         assert r.json['headers']['Accept'] == 'application/json'
         # Make sure Content-Type gets set even with no data.
-        # https://github.com/jakubroztocil/httpie/issues/137
+        # https://github.com/jkbrzt/httpie/issues/137
         assert 'application/json' in r.json['headers']['Content-Type']
 
     def test_GET_explicit_JSON_explicit_headers(self, httpbin):

tests/test_docs.py

@@ -9,7 +9,7 @@ from utils import TESTS_ROOT
 
 def has_docutils():
     try:
-        #noinspection PyUnresolvedReferences
+        # noinspection PyUnresolvedReferences
         import docutils
         return True
     except ImportError:
@@ -32,8 +32,8 @@ assert filenames
 def test_rst_file_syntax(filename):
     p = subprocess.Popen(
         ['rst2pseudoxml.py', '--report=1', '--exit-status=1', filename],
-         stderr=subprocess.PIPE,
+        stderr=subprocess.PIPE,
-         stdout=subprocess.PIPE
+        stdout=subprocess.PIPE
     )
     err = p.communicate()[1]
-    assert p.returncode == 0, err
+    assert p.returncode == 0, err.decode('utf8')

tests/test_downloads.py

@@ -2,12 +2,13 @@ import os
 import time
 
 import pytest
+import mock
 from requests.structures import CaseInsensitiveDict
 
 from httpie.compat import urlopen
 from httpie.downloads import (
     parse_content_range, filename_from_content_disposition, filename_from_url,
-    get_unique_filename, ContentRangeError, Download,
+    get_unique_filename, ContentRangeError, Downloader,
 )
 from utils import http, TestEnvironment
 
@@ -74,7 +75,31 @@ class TestDownloadUtils:
             content_type='x-foo/bar'
         )
 
-    def test_unique_filename(self):
+    @pytest.mark.parametrize(
+        'orig_name, unique_on_attempt, expected',
+        [
+            # Simple
+            ('foo.bar', 0, 'foo.bar'),
+            ('foo.bar', 1, 'foo.bar-1'),
+            ('foo.bar', 10, 'foo.bar-10'),
+            # Trim
+            ('A' * 20, 0, 'A' * 10),
+            ('A' * 20, 1, 'A' * 8 + '-1'),
+            ('A' * 20, 10, 'A' * 7 + '-10'),
+            # Trim before ext
+            ('A' * 20 + '.txt', 0, 'A' * 6 + '.txt'),
+            ('A' * 20 + '.txt', 1, 'A' * 4 + '.txt-1'),
+            # Trim at the end
+            ('foo.' + 'A' * 20, 0, 'foo.' + 'A' * 6),
+            ('foo.' + 'A' * 20, 1, 'foo.' + 'A' * 4 + '-1'),
+            ('foo.' + 'A' * 20, 10, 'foo.' + 'A' * 3 + '-10'),
+        ]
+    )
+    @mock.patch('httpie.downloads.get_filename_max_length')
+    def test_unique_filename(self, get_filename_max_length,
+                             orig_name, unique_on_attempt,
+                             expected):
+
         def attempts(unique_on_attempt=0):
             # noinspection PyUnresolvedReferences,PyUnusedLocal
             def exists(filename):
@@ -86,54 +111,55 @@ class TestDownloadUtils:
             exists.attempt = 0
             return exists
 
-        assert 'foo.bar' == get_unique_filename('foo.bar', attempts(0))
+        get_filename_max_length.return_value = 10
-        assert 'foo.bar-1' == get_unique_filename('foo.bar', attempts(1))
+
-        assert 'foo.bar-10' == get_unique_filename('foo.bar', attempts(10))
+        actual = get_unique_filename(orig_name, attempts(unique_on_attempt))
+        assert expected == actual
 
 
 class TestDownloads:
     # TODO: more tests
 
-    def test_actual_download(self, httpbin):
+    def test_actual_download(self, httpbin_both, httpbin):
-        url = httpbin.url + '/robots.txt'
+        robots_txt = '/robots.txt'
-        body = urlopen(url).read().decode()
+        body = urlopen(httpbin + robots_txt).read().decode()
         env = TestEnvironment(stdin_isatty=True, stdout_isatty=False)
-        r = http('--download', url, env=env)
+        r = http('--download', httpbin_both.url + robots_txt, env=env)
         assert 'Downloading' in r.stderr
         assert '[K' in r.stderr
         assert 'Done' in r.stderr
         assert body == r
 
-    def test_download_with_Content_Length(self, httpbin):
+    def test_download_with_Content_Length(self, httpbin_both):
         devnull = open(os.devnull, 'w')
-        download = Download(output_file=devnull, progress_file=devnull)
+        downloader = Downloader(output_file=devnull, progress_file=devnull)
-        download.start(Response(
+        downloader.start(Response(
-            url=httpbin.url + '/',
+            url=httpbin_both.url + '/',
             headers={'Content-Length': 10}
         ))
         time.sleep(1.1)
-        download.chunk_downloaded(b'12345')
+        downloader.chunk_downloaded(b'12345')
         time.sleep(1.1)
-        download.chunk_downloaded(b'12345')
+        downloader.chunk_downloaded(b'12345')
-        download.finish()
+        downloader.finish()
-        assert not download.interrupted
+        assert not downloader.interrupted
 
-    def test_download_no_Content_Length(self, httpbin):
+    def test_download_no_Content_Length(self, httpbin_both):
         devnull = open(os.devnull, 'w')
-        download = Download(output_file=devnull, progress_file=devnull)
+        downloader = Downloader(output_file=devnull, progress_file=devnull)
-        download.start(Response(url=httpbin.url + '/'))
+        downloader.start(Response(url=httpbin_both.url + '/'))
         time.sleep(1.1)
-        download.chunk_downloaded(b'12345')
+        downloader.chunk_downloaded(b'12345')
-        download.finish()
+        downloader.finish()
-        assert not download.interrupted
+        assert not downloader.interrupted
 
-    def test_download_interrupted(self, httpbin):
+    def test_download_interrupted(self, httpbin_both):
         devnull = open(os.devnull, 'w')
-        download = Download(output_file=devnull, progress_file=devnull)
+        downloader = Downloader(output_file=devnull, progress_file=devnull)
-        download.start(Response(
+        downloader.start(Response(
-            url=httpbin.url + '/',
+            url=httpbin_both.url + '/',
             headers={'Content-Length': 5}
         ))
-        download.chunk_downloaded(b'1234')
+        downloader.chunk_downloaded(b'1234')
-        download.finish()
+        downloader.finish()
-        assert download.interrupted
+        assert downloader.interrupted

tests/test_errors.py

@@ -0,0 +1,49 @@
+import mock
+from pytest import raises
+from requests import Request, Timeout
+from requests.exceptions import ConnectionError
+
+from httpie import ExitStatus
+from httpie.core import main
+
+error_msg = None
+
+
+@mock.patch('httpie.core.get_response')
+def test_error(get_response):
+    def error(msg, *args, **kwargs):
+        global error_msg
+        error_msg = msg % args
+
+    exc = ConnectionError('Connection aborted')
+    exc.request = Request(method='GET', url='http://www.google.com')
+    get_response.side_effect = exc
+    ret = main(['--ignore-stdin', 'www.google.com'], custom_log_error=error)
+    assert ret == ExitStatus.ERROR
+    assert error_msg == (
+        'ConnectionError: '
+        'Connection aborted while doing GET request to URL: '
+        'http://www.google.com')
+
+
+@mock.patch('httpie.core.get_response')
+def test_error_traceback(get_response):
+    exc = ConnectionError('Connection aborted')
+    exc.request = Request(method='GET', url='http://www.google.com')
+    get_response.side_effect = exc
+    with raises(ConnectionError):
+        main(['--ignore-stdin', '--traceback', 'www.google.com'])
+
+
+@mock.patch('httpie.core.get_response')
+def test_timeout(get_response):
+    def error(msg, *args, **kwargs):
+        global error_msg
+        error_msg = msg % args
+
+    exc = Timeout('Request timed out')
+    exc.request = Request(method='GET', url='http://www.google.com')
+    get_response.side_effect = exc
+    ret = main(['--ignore-stdin', 'www.google.com'], custom_log_error=error)
+    assert ret == ExitStatus.ERROR_TIMEOUT
+    assert error_msg == 'Request timed out (30s).'

tests/test_exit_status.py

@@ -1,63 +1,58 @@
-import requests
-import pytest
-
 from httpie import ExitStatus
 from utils import TestEnvironment, http, HTTP_OK
 
 
-class TestExitStatus:
+def test_ok_response_exits_0(httpbin):
-    def test_ok_response_exits_0(self, httpbin):
+    r = http('GET', httpbin.url + '/status/200')
-        r = http('GET', httpbin.url + '/status/200')
+    assert HTTP_OK in r
-        assert HTTP_OK in r
+    assert r.exit_status == ExitStatus.OK
-        assert r.exit_status == ExitStatus.OK
 
-    def test_error_response_exits_0_without_check_status(self, httpbin):
-        r = http('GET', httpbin.url + '/status/500')
-        assert '500 INTERNAL SERVER ERRO' in r
-        assert r.exit_status == ExitStatus.OK
-        assert not r.stderr
 
-    @pytest.mark.skipif(
+def test_error_response_exits_0_without_check_status(httpbin):
-        tuple(map(int, requests.__version__.split('.'))) < (2, 3, 0),
+    r = http('GET', httpbin.url + '/status/500')
-        reason='timeout broken in requests prior v2.3.0 (#185)'
+    assert '500 INTERNAL SERVER ERRO' in r
-    )
+    assert r.exit_status == ExitStatus.OK
-    def test_timeout_exit_status(self, httpbin):
+    assert not r.stderr
 
-        r = http('--timeout=0.5', 'GET', httpbin.url + '/delay/1',
-                 error_exit_ok=True)
-        assert r.exit_status == ExitStatus.ERROR_TIMEOUT
 
-    def test_3xx_check_status_exits_3_and_stderr_when_stdout_redirected(
+def test_timeout_exit_status(httpbin):
-            self, httpbin):
-        env = TestEnvironment(stdout_isatty=False)
-        r = http('--check-status', '--headers',
-                 'GET', httpbin.url + '/status/301',
-                 env=env, error_exit_ok=True)
-        assert '301 MOVED PERMANENTLY' in r
-        assert r.exit_status == ExitStatus.ERROR_HTTP_3XX
-        assert '301 moved permanently' in r.stderr.lower()
 
-    @pytest.mark.skipif(
+    r = http('--timeout=0.01', 'GET', httpbin.url + '/delay/0.02',
-        requests.__version__ == '0.13.6',
+             error_exit_ok=True)
-        reason='Redirects with prefetch=False are broken in Requests 0.13.6')
+    assert r.exit_status == ExitStatus.ERROR_TIMEOUT
-    def test_3xx_check_status_redirects_allowed_exits_0(self, httpbin):
-        r = http('--check-status', '--follow',
-                 'GET', httpbin.url + '/status/301',
-                 error_exit_ok=True)
-        # The redirect will be followed so 200 is expected.
-        assert HTTP_OK in r
-        assert r.exit_status == ExitStatus.OK
 
-    def test_4xx_check_status_exits_4(self, httpbin):
-        r = http('--check-status', 'GET', httpbin.url + '/status/401',
-                 error_exit_ok=True)
-        assert '401 UNAUTHORIZED' in r
-        assert r.exit_status == ExitStatus.ERROR_HTTP_4XX
-        # Also stderr should be empty since stdout isn't redirected.
-        assert not r.stderr
 
-    def test_5xx_check_status_exits_5(self, httpbin):
+def test_3xx_check_status_exits_3_and_stderr_when_stdout_redirected(
-        r = http('--check-status', 'GET', httpbin.url + '/status/500',
+        httpbin):
-                 error_exit_ok=True)
+    env = TestEnvironment(stdout_isatty=False)
-        assert '500 INTERNAL SERVER ERROR' in r
+    r = http('--check-status', '--headers',
-        assert r.exit_status == ExitStatus.ERROR_HTTP_5XX
+             'GET', httpbin.url + '/status/301',
+             env=env, error_exit_ok=True)
+    assert '301 MOVED PERMANENTLY' in r
+    assert r.exit_status == ExitStatus.ERROR_HTTP_3XX
+    assert '301 moved permanently' in r.stderr.lower()
+
+
+def test_3xx_check_status_redirects_allowed_exits_0(httpbin):
+    r = http('--check-status', '--follow',
+             'GET', httpbin.url + '/status/301',
+             error_exit_ok=True)
+    # The redirect will be followed so 200 is expected.
+    assert HTTP_OK in r
+    assert r.exit_status == ExitStatus.OK
+
+
+def test_4xx_check_status_exits_4(httpbin):
+    r = http('--check-status', 'GET', httpbin.url + '/status/401',
+             error_exit_ok=True)
+    assert '401 UNAUTHORIZED' in r
+    assert r.exit_status == ExitStatus.ERROR_HTTP_4XX
+    # Also stderr should be empty since stdout isn't redirected.
+    assert not r.stderr
+
+
+def test_5xx_check_status_exits_5(httpbin):
+    r = http('--check-status', 'GET', httpbin.url + '/status/500',
+             error_exit_ok=True)
+    assert '500 INTERNAL SERVER ERROR' in r
+    assert r.exit_status == ExitStatus.ERROR_HTTP_5XX

tests/test_httpie.py

@@ -7,73 +7,81 @@ import httpie
 from httpie.compat import is_py26
 
 
-class TestHTTPie:
+def test_debug():
+    r = http('--debug')
+    assert r.exit_status == httpie.ExitStatus.OK
+    assert 'HTTPie %s' % httpie.__version__ in r.stderr
 
-    def test_debug(self):
-        r = http('--debug')
-        assert r.exit_status == httpie.ExitStatus.OK
-        assert 'HTTPie %s' % httpie.__version__ in r.stderr
-        assert 'HTTPie data:' in r.stderr
 
-    def test_help(self):
+def test_help():
-        r = http('--help', error_exit_ok=True)
+    r = http('--help', error_exit_ok=True)
-        assert r.exit_status == httpie.ExitStatus.OK
+    assert r.exit_status == httpie.ExitStatus.OK
-        assert 'https://github.com/jakubroztocil/httpie/issues' in r
+    assert 'https://github.com/jkbrzt/httpie/issues' in r
 
-    def test_version(self):
-        r = http('--version', error_exit_ok=True)
-        assert r.exit_status == httpie.ExitStatus.OK
-        # FIXME: py3 has version in stdout, py2 in stderr
-        assert httpie.__version__ == r.stderr.strip() + r.strip()
 
-    def test_GET(self, httpbin):
+def test_version():
-        r = http('GET', httpbin.url + '/get')
+    r = http('--version', error_exit_ok=True)
-        assert HTTP_OK in r
+    assert r.exit_status == httpie.ExitStatus.OK
+    # FIXME: py3 has version in stdout, py2 in stderr
+    assert httpie.__version__ == r.stderr.strip() + r.strip()
 
-    def test_DELETE(self, httpbin):
-        r = http('DELETE', httpbin.url + '/delete')
-        assert HTTP_OK in r
 
-    def test_PUT(self, httpbin):
+def test_GET(httpbin_both):
-        r = http('PUT', httpbin.url + '/put', 'foo=bar')
+    r = http('GET', httpbin_both + '/get')
-        assert HTTP_OK in r
+    assert HTTP_OK in r
-        assert r.json['json']['foo'] == 'bar'
 
-    def test_POST_JSON_data(self, httpbin):
-        r = http('POST', httpbin.url + '/post', 'foo=bar')
-        assert HTTP_OK in r
-        assert r.json['json']['foo'] == 'bar'
 
-    def test_POST_form(self, httpbin):
+def test_DELETE(httpbin_both):
-        r = http('--form', 'POST', httpbin.url + '/post', 'foo=bar')
+    r = http('DELETE', httpbin_both + '/delete')
-        assert HTTP_OK in r
+    assert HTTP_OK in r
-        assert '"foo": "bar"' in r
 
-    def test_POST_form_multiple_values(self, httpbin):
-        r = http('--form', 'POST', httpbin.url + '/post', 'foo=bar', 'foo=baz')
-        assert HTTP_OK in r
-        assert r.json['form'] == {'foo': ['bar', 'baz']}
 
-    def test_POST_stdin(self, httpbin):
+def test_PUT(httpbin_both):
-        with open(FILE_PATH) as f:
+    r = http('PUT', httpbin_both + '/put', 'foo=bar')
-            env = TestEnvironment(stdin=f, stdin_isatty=False)
+    assert HTTP_OK in r
-            r = http('--form', 'POST', httpbin.url + '/post', env=env)
+    assert r.json['json']['foo'] == 'bar'
-        assert HTTP_OK in r
-        assert FILE_CONTENT in r
 
-    def test_headers(self, httpbin):
-        r = http('GET', httpbin.url + '/headers', 'Foo:bar')
-        assert HTTP_OK in r
-        assert '"User-Agent": "HTTPie' in r, r
-        assert '"Foo": "bar"' in r
 
-    @pytest.mark.skipif(
+def test_POST_JSON_data(httpbin_both):
-        is_py26,
+    r = http('POST', httpbin_both + '/post', 'foo=bar')
-        reason='the `object_pairs_hook` arg for `json.loads()` is Py>2.6 only'
+    assert HTTP_OK in r
-    )
+    assert r.json['json']['foo'] == 'bar'
-    def test_json_input_preserve_order(self, httpbin):
+
-        r = http('PATCH', httpbin.url + '/patch',
+
-                 'order:={"map":{"1":"first","2":"second"}}')
+def test_POST_form(httpbin_both):
-        assert HTTP_OK in r
+    r = http('--form', 'POST', httpbin_both + '/post', 'foo=bar')
-        assert r.json['data'] == \
+    assert HTTP_OK in r
-            '{"order": {"map": {"1": "first", "2": "second"}}}'
+    assert '"foo": "bar"' in r
+
+
+def test_POST_form_multiple_values(httpbin_both):
+    r = http('--form', 'POST', httpbin_both + '/post', 'foo=bar', 'foo=baz')
+    assert HTTP_OK in r
+    assert r.json['form'] == {'foo': ['bar', 'baz']}
+
+
+def test_POST_stdin(httpbin_both):
+    with open(FILE_PATH) as f:
+        env = TestEnvironment(stdin=f, stdin_isatty=False)
+        r = http('--form', 'POST', httpbin_both + '/post', env=env)
+    assert HTTP_OK in r
+    assert FILE_CONTENT in r
+
+
+def test_headers(httpbin_both):
+    r = http('GET', httpbin_both + '/headers', 'Foo:bar')
+    assert HTTP_OK in r
+    assert '"User-Agent": "HTTPie' in r, r
+    assert '"Foo": "bar"' in r
+
+
+@pytest.mark.skipif(
+    is_py26,
+    reason='the `object_pairs_hook` arg for `json.loads()` is Py>2.6 only'
+)
+def test_json_input_preserve_order(httpbin_both):
+    r = http('PATCH', httpbin_both + '/patch',
+             'order:={"map":{"1":"first","2":"second"}}')
+    assert HTTP_OK in r
+    assert r.json['data'] == \
+        '{"order": {"map": {"1": "first", "2": "second"}}}'

tests/test_output.py

@@ -1,10 +1,30 @@
+import os
+from tempfile import gettempdir
+
 import pytest
 
 from utils import TestEnvironment, http, HTTP_OK, COLOR, CRLF
 from httpie import ExitStatus
+from httpie.compat import urlopen
 from httpie.output.formatters.colors import get_lexer
 
 
+@pytest.mark.parametrize('stdout_isatty', [True, False])
+def test_output_option(httpbin, stdout_isatty):
+    output_filename = os.path.join(gettempdir(), test_output_option.__name__)
+    url = httpbin + '/robots.txt'
+
+    r = http('--output', output_filename, url,
+             env=TestEnvironment(stdout_isatty=stdout_isatty))
+    assert r == ''
+
+    expected_body = urlopen(url).read().decode()
+    with open(output_filename, 'r') as f:
+        actual_body = f.read()
+
+    assert actual_body == expected_body
+
+
 class TestVerboseFlag:
     def test_verbose(self, httpbin):
         r = http('--verbose',
@@ -13,7 +33,7 @@ class TestVerboseFlag:
         assert r.count('__test__') == 2
 
     def test_verbose_form(self, httpbin):
-        # https://github.com/jakubroztocil/httpie/issues/53
+        # https://github.com/jkbrzt/httpie/issues/53
         r = http('--verbose', '--form', 'POST', httpbin.url + '/post',
                  'A=B', 'C=D')
         assert HTTP_OK in r
@@ -25,25 +45,38 @@ class TestVerboseFlag:
         assert HTTP_OK in r
         assert '"baz": "bar"' in r
 
+    def test_verbose_implies_all(self, httpbin):
+        r = http('--verbose', '--follow', httpbin + '/redirect/1')
+        assert 'GET /redirect/1 HTTP/1.1' in r
+        assert 'HTTP/1.1 302 FOUND' in r
+        assert 'GET /get HTTP/1.1' in r
+        assert HTTP_OK in r
+
 
 class TestColors:
 
-    @pytest.mark.parametrize('mime', [
+    @pytest.mark.parametrize(
-        'application/json',
+        argnames=['mime', 'explicit_json', 'body', 'expected_lexer_name'],
-        'application/json+foo',
+        argvalues=[
-        'application/foo+json',
+            ('application/json',     False, None, 'JSON'),
-        'application/json-foo',
+            ('application/json+foo', False, None, 'JSON'),
-        'application/x-json',
+            ('application/foo+json', False, None, 'JSON'),
-        'foo/json',
+            ('application/json-foo', False, None, 'JSON'),
-        'foo/json+bar',
+            ('application/x-json',   False, None, 'JSON'),
-        'foo/bar+json',
+            ('foo/json',             False, None, 'JSON'),
-        'foo/json-foo',
+            ('foo/json+bar',         False, None, 'JSON'),
-        'foo/x-json',
+            ('foo/bar+json',         False, None, 'JSON'),
-    ])
+            ('foo/json-foo',         False, None, 'JSON'),
-    def test_get_lexer(self, mime):
+            ('foo/x-json',           False, None, 'JSON'),
-        lexer = get_lexer(mime)
+            ('application/vnd.comverge.grid+hal+json', False, None, 'JSON'),
+            ('text/plain',           True, '{}', 'JSON'),
+            ('text/plain',           True, 'foo', 'Text only'),
+        ]
+    )
+    def test_get_lexer(self, mime, explicit_json, body, expected_lexer_name):
+        lexer = get_lexer(mime, body=body, explicit_json=explicit_json)
         assert lexer is not None
-        assert lexer.name == 'JSON'
+        assert lexer.name == expected_lexer_name
 
     def test_get_lexer_not_found(self):
         assert get_lexer('xxx/yyy') is None

tests/test_redirects.py

@@ -0,0 +1,47 @@
+"""High-level tests."""
+import pytest
+
+from httpie import ExitStatus
+from utils import http, HTTP_OK
+
+
+def test_follow_all_redirects_shown(httpbin):
+    r = http('--follow', '--all', httpbin.url + '/redirect/2')
+    assert r.count('HTTP/1.1') == 3
+    assert r.count('HTTP/1.1 302 FOUND', 2)
+    assert HTTP_OK in r
+
+
+@pytest.mark.parametrize('follow_flag', ['--follow', '-F'])
+def test_follow_without_all_redirects_hidden(httpbin, follow_flag):
+    r = http(follow_flag, httpbin.url + '/redirect/2')
+    assert r.count('HTTP/1.1') == 1
+    assert HTTP_OK in r
+
+
+def test_follow_all_output_options_used_for_redirects(httpbin):
+    r = http('--check-status',
+             '--follow',
+             '--all',
+             '--print=H',
+             httpbin.url + '/redirect/2')
+    assert r.count('GET /') == 3
+    assert HTTP_OK not in r
+
+
+def test_follow_redirect_output_options(httpbin):
+    r = http('--check-status',
+             '--follow',
+             '--all',
+             '--print=h',
+             '--history-print=H',
+             httpbin.url + '/redirect/2')
+    assert r.count('GET /') == 2
+    assert 'HTTP/1.1 302 FOUND' not in r
+    assert HTTP_OK in r
+
+
+def test_max_redirects(httpbin):
+    r = http('--max-redirects=1', '--follow', httpbin.url + '/redirect/3',
+             error_exit_ok=True)
+    assert r.exit_status == ExitStatus.ERROR_TOO_MANY_REDIRECTS

tests/test_regressions.py

@@ -7,7 +7,7 @@ from httpie.compat import is_windows
 
 def test_Host_header_overwrite(httpbin):
     """
-    https://github.com/jakubroztocil/httpie/issues/235
+    https://github.com/jkbrzt/httpie/issues/235
 
     """
     host = 'httpbin.org'
@@ -21,7 +21,7 @@ def test_Host_header_overwrite(httpbin):
 @pytest.mark.skipif(is_windows, reason='Unix-only')
 def test_output_devnull(httpbin):
     """
-    https://github.com/jakubroztocil/httpie/issues/252
+    https://github.com/jkbrzt/httpie/issues/252
 
     """
     http('--output=/dev/null', httpbin + '/get')

tests/test_sessions.py

@@ -2,12 +2,12 @@
 import os
 import shutil
 import sys
+from tempfile import gettempdir
 
 import pytest
 
 from httpie.plugins.builtin import HTTPBasicAuth
-from utils import TestEnvironment, mk_config_dir, http, HTTP_OK, \
+from utils import TestEnvironment, mk_config_dir, http, HTTP_OK
-    no_content_type
 from fixtures import UNICODE
 
 
@@ -64,17 +64,20 @@ class TestSessionFlow(SessionTestBase):
     def test_session_update(self, httpbin):
         self.start_session(httpbin)
         # Get a response to a request from the original session.
-        r2 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r2
 
         # Make a request modifying the session data.
         r3 = http('--follow', '--session=test', '--auth=username:password2',
-                  'GET', httpbin.url + '/cookies/set?hello=world2', 'Hello:World2',
+                  'GET', httpbin.url + '/cookies/set?hello=world2',
+                  'Hello:World2',
                   env=self.env())
         assert HTTP_OK in r3
 
         # Get a response to a request from the updated session.
-        r4 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r4 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r4
         assert r4.json['headers']['Hello'] == 'World2'
         assert r4.json['headers']['Cookie'] == 'hello=world2'
@@ -84,7 +87,8 @@ class TestSessionFlow(SessionTestBase):
     def test_session_read_only(self, httpbin):
         self.start_session(httpbin)
         # Get a response from the original session.
-        r2 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r2
 
         # Make a request modifying the session data but
@@ -96,7 +100,8 @@ class TestSessionFlow(SessionTestBase):
         assert HTTP_OK in r3
 
         # Get a response from the updated session.
-        r4 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+        r4 = http('--session=test', 'GET', httpbin.url + '/get',
+                  env=self.env())
         assert HTTP_OK in r4
 
         # Origin can differ on Travis.
@@ -117,10 +122,10 @@ class TestSession(SessionTestBase):
                   'If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT',
                   env=self.env())
         assert HTTP_OK in r1
-
+        r2 = http('--session=test', 'GET', httpbin.url + '/get',
-        r2 = http('--session=test', 'GET', httpbin.url + '/get', env=self.env())
+                  env=self.env())
         assert HTTP_OK in r2
-        assert no_content_type(r2.json['headers'])
+        assert 'Content-Type' not in r2.json['headers']
         assert 'If-Unmodified-Since' not in r2.json['headers']
 
     def test_session_by_path(self, httpbin):
@@ -138,7 +143,7 @@ class TestSession(SessionTestBase):
     @pytest.mark.skipif(
         sys.version_info >= (3,),
         reason="This test fails intermittently on Python 3 - "
-               "see https://github.com/jakubroztocil/httpie/issues/282")
+               "see https://github.com/jkbrzt/httpie/issues/282")
     def test_session_unicode(self, httpbin):
         self.start_session(httpbin)
 
@@ -152,14 +157,14 @@ class TestSession(SessionTestBase):
         assert HTTP_OK in r2
 
         # FIXME: Authorization *sometimes* is not present on Python3
-        assert (r2.json['headers']['Authorization']
+        assert (r2.json['headers']['Authorization'] ==
-                == HTTPBasicAuth.make_header(u'test', UNICODE))
+                HTTPBasicAuth.make_header(u'test', UNICODE))
         # httpbin doesn't interpret utf8 headers
         assert UNICODE in r2
 
     def test_session_default_header_value_overwritten(self, httpbin):
         self.start_session(httpbin)
-        # https://github.com/jakubroztocil/httpie/issues/180
+        # https://github.com/jkbrzt/httpie/issues/180
         r1 = http('--session=test',
                   httpbin.url + '/headers', 'User-Agent:custom',
                   env=self.env())
@@ -169,3 +174,14 @@ class TestSession(SessionTestBase):
         r2 = http('--session=test', httpbin.url + '/headers', env=self.env())
         assert HTTP_OK in r2
         assert r2.json['headers']['User-Agent'] == 'custom'
+
+    def test_download_in_session(self, httpbin):
+        # https://github.com/jkbrzt/httpie/issues/412
+        self.start_session(httpbin)
+        cwd = os.getcwd()
+        os.chdir(gettempdir())
+        try:
+            http('--session=test', '--download',
+                 httpbin.url + '/get', env=self.env())
+        finally:
+            os.chdir(cwd)

tests/test_ssl.py

@@ -5,6 +5,7 @@ import pytest_httpbin.certs
 from requests.exceptions import SSLError
 
 from httpie import ExitStatus
+from httpie.input import SSL_VERSION_ARG_MAPPING
 from utils import http, HTTP_OK, TESTS_ROOT
 
 
@@ -12,17 +13,44 @@ CLIENT_CERT = os.path.join(TESTS_ROOT, 'client_certs', 'client.crt')
 CLIENT_KEY = os.path.join(TESTS_ROOT, 'client_certs', 'client.key')
 CLIENT_PEM = os.path.join(TESTS_ROOT, 'client_certs', 'client.pem')
 
+# FIXME:
 # We test against a local httpbin instance which uses a self-signed cert.
 # Requests without --verify=<CA_BUNDLE> will fail with a verification error.
 # See: https://github.com/kevin1024/pytest-httpbin#https-support
 CA_BUNDLE = pytest_httpbin.certs.where()
 
 
-class TestClientSSLCertHandling(object):
+@pytest.mark.parametrize('ssl_version', SSL_VERSION_ARG_MAPPING.keys())
+def test_ssl_version(httpbin_secure, ssl_version):
+    try:
+        r = http(
+            '--ssl', ssl_version,
+            httpbin_secure + '/get'
+        )
+        assert HTTP_OK in r
+    except SSLError as e:
+        if ssl_version == 'ssl3':
+            # pytest-httpbin doesn't support ssl3
+            assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e)
+        else:
+            raise
+
+
+class TestClientCert:
+
+    def test_cert_and_key(self, httpbin_secure):
+        r = http(httpbin_secure + '/get',
+                 '--cert', CLIENT_CERT,
+                 '--cert-key', CLIENT_KEY)
+        assert HTTP_OK in r
+
+    def test_cert_pem(self, httpbin_secure):
+        r = http(httpbin_secure + '/get',
+                 '--cert', CLIENT_PEM)
+        assert HTTP_OK in r
 
     def test_cert_file_not_found(self, httpbin_secure):
         r = http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
                  '--cert', '/__not_found__',
                  error_exit_ok=True)
         assert r.exit_status == ExitStatus.ERROR
@@ -31,45 +59,31 @@ class TestClientSSLCertHandling(object):
     def test_cert_file_invalid(self, httpbin_secure):
         with pytest.raises(SSLError):
             http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
                  '--cert', __file__)
 
     def test_cert_ok_but_missing_key(self, httpbin_secure):
         with pytest.raises(SSLError):
             http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
                  '--cert', CLIENT_CERT)
 
-    def test_cert_and_key(self, httpbin_secure):
-        r = http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
-                 '--cert', CLIENT_CERT,
-                 '--cert-key', CLIENT_KEY)
-        assert HTTP_OK in r
 
-    def test_cert_pem(self, httpbin_secure):
+class TestServerCert:
-        r = http(httpbin_secure + '/get',
-                 '--verify', CA_BUNDLE,
-                 '--cert', CLIENT_PEM)
-        assert HTTP_OK in r
-
-
-class TestServerSSLCertHandling(object):
-
-    def test_self_signed_server_cert_by_default_raises_ssl_error(
-            self, httpbin_secure):
-        with pytest.raises(SSLError):
-            http(httpbin_secure.url + '/get')
 
     def test_verify_no_OK(self, httpbin_secure):
         r = http(httpbin_secure.url + '/get', '--verify=no')
         assert HTTP_OK in r
 
     def test_verify_custom_ca_bundle_path(
-            self, httpbin_secure):
+            self, httpbin_secure_untrusted):
-        r = http(httpbin_secure.url + '/get', '--verify', CA_BUNDLE)
+        r = http(httpbin_secure_untrusted + '/get', '--verify', CA_BUNDLE)
         assert HTTP_OK in r
 
+    def test_self_signed_server_cert_by_default_raises_ssl_error(
+            self,
+            httpbin_secure_untrusted):
+        with pytest.raises(SSLError):
+            http(httpbin_secure_untrusted.url + '/get')
+
     def test_verify_custom_ca_bundle_invalid_path(self, httpbin_secure):
         with pytest.raises(SSLError):
             http(httpbin_secure.url + '/get', '--verify', '/__not_found__')

tests/test_stream.py

@@ -6,37 +6,39 @@ from utils import http, TestEnvironment
 from fixtures import BIN_FILE_CONTENT, BIN_FILE_PATH
 
 
-class TestStream:
+# GET because httpbin 500s with binary POST body.
-    # GET because httpbin 500s with binary POST body.
 
-    @pytest.mark.skipif(is_windows,
-                        reason='Pretty redirect not supported under Windows')
-    def test_pretty_redirected_stream(self, httpbin):
-        """Test that --stream works with prettified redirected output."""
-        with open(BIN_FILE_PATH, 'rb') as f:
-            env = TestEnvironment(colors=256, stdin=f,
-                                  stdin_isatty=False,
-                                  stdout_isatty=False)
-            r = http('--verbose', '--pretty=all', '--stream', 'GET',
-                     httpbin.url + '/get', env=env)
-        assert BINARY_SUPPRESSED_NOTICE.decode() in r
 
-    def test_encoded_stream(self, httpbin):
+@pytest.mark.skipif(is_windows,
-        """Test that --stream works with non-prettified
+                    reason='Pretty redirect not supported under Windows')
-        redirected terminal output."""
+def test_pretty_redirected_stream(httpbin):
-        with open(BIN_FILE_PATH, 'rb') as f:
+    """Test that --stream works with prettified redirected output."""
-            env = TestEnvironment(stdin=f, stdin_isatty=False)
+    with open(BIN_FILE_PATH, 'rb') as f:
-            r = http('--pretty=none', '--stream', '--verbose', 'GET',
+        env = TestEnvironment(colors=256, stdin=f,
-                     httpbin.url + '/get', env=env)
+                              stdin_isatty=False,
-        assert BINARY_SUPPRESSED_NOTICE.decode() in r
+                              stdout_isatty=False)
+        r = http('--verbose', '--pretty=all', '--stream', 'GET',
+                 httpbin.url + '/get', env=env)
+    assert BINARY_SUPPRESSED_NOTICE.decode() in r
 
-    def test_redirected_stream(self, httpbin):
+
-        """Test that --stream works with non-prettified
+def test_encoded_stream(httpbin):
-        redirected terminal output."""
+    """Test that --stream works with non-prettified
-        with open(BIN_FILE_PATH, 'rb') as f:
+    redirected terminal output."""
-            env = TestEnvironment(stdout_isatty=False,
+    with open(BIN_FILE_PATH, 'rb') as f:
-                                  stdin_isatty=False,
+        env = TestEnvironment(stdin=f, stdin_isatty=False)
-                                  stdin=f)
+        r = http('--pretty=none', '--stream', '--verbose', 'GET',
-            r = http('--pretty=none', '--stream', '--verbose', 'GET',
+                 httpbin.url + '/get', env=env)
-                     httpbin.url + '/get', env=env)
+    assert BINARY_SUPPRESSED_NOTICE.decode() in r
-        assert BIN_FILE_CONTENT in r
+
+
+def test_redirected_stream(httpbin):
+    """Test that --stream works with non-prettified
+    redirected terminal output."""
+    with open(BIN_FILE_PATH, 'rb') as f:
+        env = TestEnvironment(stdout_isatty=False,
+                              stdin_isatty=False,
+                              stdin=f)
+        r = http('--pretty=none', '--stream', '--verbose', 'GET',
+                 httpbin.url + '/get', env=env)
+    assert BIN_FILE_CONTENT in r

tests/test_unicode.py

@@ -7,81 +7,91 @@ from utils import http, HTTP_OK
 from fixtures import UNICODE
 
 
-class TestUnicode:
+def test_unicode_headers(httpbin):
+    # httpbin doesn't interpret utf8 headers
+    r = http(httpbin.url + '/headers', u'Test:%s' % UNICODE)
+    assert HTTP_OK in r
 
-    def test_unicode_headers(self, httpbin):
-        # httpbin doesn't interpret utf8 headers
-        r = http(httpbin.url + '/headers', u'Test:%s' % UNICODE)
-        assert HTTP_OK in r
 
-    def test_unicode_headers_verbose(self, httpbin):
+def test_unicode_headers_verbose(httpbin):
-        # httpbin doesn't interpret utf8 headers
+    # httpbin doesn't interpret utf8 headers
-        r = http('--verbose', httpbin.url + '/headers', u'Test:%s' % UNICODE)
+    r = http('--verbose', httpbin.url + '/headers', u'Test:%s' % UNICODE)
-        assert HTTP_OK in r
+    assert HTTP_OK in r
-        assert UNICODE in r
+    assert UNICODE in r
 
-    def test_unicode_form_item(self, httpbin):
-        r = http('--form', 'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
-        assert HTTP_OK in r
-        assert r.json['form'] == {'test': UNICODE}
 
-    def test_unicode_form_item_verbose(self, httpbin):
+def test_unicode_form_item(httpbin):
-        r = http('--verbose', '--form',
+    r = http('--form', 'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
-                 'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
+    assert HTTP_OK in r
-        assert HTTP_OK in r
+    assert r.json['form'] == {'test': UNICODE}
-        assert UNICODE in r
 
-    def test_unicode_json_item(self, httpbin):
-        r = http('--json', 'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
-        assert HTTP_OK in r
-        assert r.json['json'] == {'test': UNICODE}
 
-    def test_unicode_json_item_verbose(self, httpbin):
+def test_unicode_form_item_verbose(httpbin):
-        r = http('--verbose', '--json',
+    r = http('--verbose', '--form',
-                 'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
+             'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
-        assert HTTP_OK in r
+    assert HTTP_OK in r
-        assert UNICODE in r
+    assert UNICODE in r
 
-    def test_unicode_raw_json_item(self, httpbin):
-        r = http('--json', 'POST', httpbin.url + '/post',
-                 u'test:={ "%s" : [ "%s" ] }' % (UNICODE, UNICODE))
-        assert HTTP_OK in r
-        assert r.json['json'] == {'test': {UNICODE: [UNICODE]}}
 
-    def test_unicode_raw_json_item_verbose(self, httpbin):
+def test_unicode_json_item(httpbin):
-        r = http('--json', 'POST', httpbin.url + '/post',
+    r = http('--json', 'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
-                 u'test:={ "%s" : [ "%s" ] }' % (UNICODE, UNICODE))
+    assert HTTP_OK in r
-        assert HTTP_OK in r
+    assert r.json['json'] == {'test': UNICODE}
-        assert r.json['json'] == {'test': {UNICODE: [UNICODE]}}
 
-    def test_unicode_url_query_arg_item(self, httpbin):
-        r = http(httpbin.url + '/get', u'test==%s' % UNICODE)
-        assert HTTP_OK in r
-        assert r.json['args'] == {'test': UNICODE}, r
 
-    def test_unicode_url_query_arg_item_verbose(self, httpbin):
+def test_unicode_json_item_verbose(httpbin):
-        r = http('--verbose', httpbin.url + '/get', u'test==%s' % UNICODE)
+    r = http('--verbose', '--json',
-        assert HTTP_OK in r
+             'POST', httpbin.url + '/post', u'test=%s' % UNICODE)
-        assert UNICODE in r
+    assert HTTP_OK in r
+    assert UNICODE in r
 
-    def test_unicode_url(self, httpbin):
-        r = http(httpbin.url + u'/get?test=' + UNICODE)
-        assert HTTP_OK in r
-        assert r.json['args'] == {'test': UNICODE}
 
-    # def test_unicode_url_verbose(self):
+def test_unicode_raw_json_item(httpbin):
-    #     r = http(httpbin.url + '--verbose', u'/get?test=' + UNICODE)
+    r = http('--json', 'POST', httpbin.url + '/post',
-    #     assert HTTP_OK in r
+             u'test:={ "%s" : [ "%s" ] }' % (UNICODE, UNICODE))
+    assert HTTP_OK in r
+    assert r.json['json'] == {'test': {UNICODE: [UNICODE]}}
 
-    def test_unicode_basic_auth(self, httpbin):
-        # it doesn't really authenticate us because httpbin
-        # doesn't interpret the utf8-encoded auth
-        http('--verbose', '--auth', u'test:%s' % UNICODE,
-             httpbin.url + u'/basic-auth/test/' + UNICODE)
 
-    def test_unicode_digest_auth(self, httpbin):
+def test_unicode_raw_json_item_verbose(httpbin):
-        # it doesn't really authenticate us because httpbin
+    r = http('--json', 'POST', httpbin.url + '/post',
-        # doesn't interpret the utf8-encoded auth
+             u'test:={ "%s" : [ "%s" ] }' % (UNICODE, UNICODE))
-        http('--auth-type=digest',
+    assert HTTP_OK in r
-             '--auth', u'test:%s' % UNICODE,
+    assert r.json['json'] == {'test': {UNICODE: [UNICODE]}}
-             httpbin.url + u'/digest-auth/auth/test/' + UNICODE)
+
+
+def test_unicode_url_query_arg_item(httpbin):
+    r = http(httpbin.url + '/get', u'test==%s' % UNICODE)
+    assert HTTP_OK in r
+    assert r.json['args'] == {'test': UNICODE}, r
+
+
+def test_unicode_url_query_arg_item_verbose(httpbin):
+    r = http('--verbose', httpbin.url + '/get', u'test==%s' % UNICODE)
+    assert HTTP_OK in r
+    assert UNICODE in r
+
+
+def test_unicode_url(httpbin):
+    r = http(httpbin.url + u'/get?test=' + UNICODE)
+    assert HTTP_OK in r
+    assert r.json['args'] == {'test': UNICODE}
+
+# def test_unicode_url_verbose(self):
+#     r = http(httpbin.url + '--verbose', u'/get?test=' + UNICODE)
+#     assert HTTP_OK in r
+
+
+def test_unicode_basic_auth(httpbin):
+    # it doesn't really authenticate us because httpbin
+    # doesn't interpret the utf8-encoded auth
+    http('--verbose', '--auth', u'test:%s' % UNICODE,
+         httpbin.url + u'/basic-auth/test/' + UNICODE)
+
+
+def test_unicode_digest_auth(httpbin):
+    # it doesn't really authenticate us because httpbin
+    # doesn't interpret the utf8-encoded auth
+    http('--auth-type=digest',
+         '--auth', u'test:%s' % UNICODE,
+         httpbin.url + u'/digest-auth/auth/test/' + UNICODE)

tests/test_uploads.py

@@ -23,6 +23,7 @@ class TestMultipartFormDataFileUpload:
                ' filename="%s"' % os.path.basename(FILE_PATH) in r
         assert FILE_CONTENT in r
         assert '"foo": "bar"' in r
+        assert 'Content-Type: text/plain' in r
 
     def test_upload_multiple_fields_with_the_same_name(self, httpbin):
         r = http('--form', '--verbose', 'POST', httpbin.url + '/post',
@@ -30,10 +31,11 @@ class TestMultipartFormDataFileUpload:
                  'test-file@%s' % FILE_PATH_ARG)
         assert HTTP_OK in r
         assert r.count('Content-Disposition: form-data; name="test-file";'
-               ' filename="%s"' % os.path.basename(FILE_PATH)) == 2
+                       ' filename="%s"' % os.path.basename(FILE_PATH)) == 2
         # Should be 4, but is 3 because httpbin
         # doesn't seem to support filed field lists
         assert r.count(FILE_CONTENT) in [3, 4]
+        assert r.count('Content-Type: text/plain') == 2
 
 
 class TestRequestBodyFromFilePath:

tests/test_windows.py

@@ -22,7 +22,9 @@ class TestFakeWindows:
     def test_output_file_pretty_not_allowed_on_windows(self, httpbin):
         env = TestEnvironment(is_windows=True)
         output_file = os.path.join(
-            tempfile.gettempdir(), '__httpie_test_output__')
+            tempfile.gettempdir(),
+            self.test_output_file_pretty_not_allowed_on_windows.__name__
+        )
         r = http('--output', output_file,
                  '--pretty=all', 'GET', httpbin.url + '/get',
                  env=env, error_exit_ok=True)

tests/utils.py

@@ -1,23 +1,18 @@
 # coding=utf-8
-"""Utilities used by HTTPie tests.
+"""Utilities for HTTPie test suite."""
-
-"""
 import os
 import sys
 import time
 import json
-import shutil
 import tempfile
 
-import httpie
+from httpie import ExitStatus, EXIT_STATUS_LABELS
 from httpie.context import Environment
 from httpie.core import main
 from httpie.compat import bytes, str
 
 
 TESTS_ROOT = os.path.abspath(os.path.dirname(__file__))
-
-
 CRLF = '\r\n'
 COLOR = '\x1b['
 HTTP_OK = '200 OK'
@@ -28,14 +23,9 @@ HTTP_OK_COLOR = (
 )
 
 
-def no_content_type(headers):
+def mk_config_dir():
-    return (
+    dirname = tempfile.mkdtemp(prefix='httpie_config_')
-        'Content-Type' not in headers
+    return dirname
-        # We need to do also this because of this issue:
-        # <https://github.com/kevin1024/pytest-httpbin/issues/5>
-        # TODO: remove this function once the issue is if fixed
-        or headers['Content-Type'] == 'text/plain'
-    )
 
 
 def add_auth(url, auth):
@@ -44,136 +34,44 @@ def add_auth(url, auth):
 
 
 class TestEnvironment(Environment):
-    """
+    """Environment subclass with reasonable defaults for testing."""
-    Environment subclass with reasonable defaults suitable for testing.
-
-    """
     colors = 0
     stdin_isatty = True,
     stdout_isatty = True
     is_windows = False
 
-    _shutil = shutil  # needed by __del__ (would get gc'd)
-
     def __init__(self, **kwargs):
-
         if 'stdout' not in kwargs:
-            kwargs['stdout'] = tempfile.TemporaryFile('w+b')
+            kwargs['stdout'] = tempfile.TemporaryFile(
-
+                mode='w+b',
+                prefix='httpie_stdout'
+            )
         if 'stderr' not in kwargs:
-            kwargs['stderr'] = tempfile.TemporaryFile('w+t')
+            kwargs['stderr'] = tempfile.TemporaryFile(
-
+                mode='w+t',
-        self.delete_config_dir = False
+                prefix='httpie_stderr'
-        if 'config_dir' not in kwargs:
+            )
-            kwargs['config_dir'] = mk_config_dir()
-            self.delete_config_dir = True
-
         super(TestEnvironment, self).__init__(**kwargs)
+        self._delete_config_dir = False
+
+    @property
+    def config(self):
+        if not self.config_dir.startswith(tempfile.gettempdir()):
+            self.config_dir = mk_config_dir()
+            self._delete_config_dir = True
+        return super(TestEnvironment, self).config
+
+    def cleanup(self):
+        if self._delete_config_dir:
+            assert self.config_dir.startswith(tempfile.gettempdir())
+            from shutil import rmtree
+            rmtree(self.config_dir)
 
     def __del__(self):
-        if self.delete_config_dir:
-            self._shutil.rmtree(self.config_dir)
-
-
-def http(*args, **kwargs):
-    """
-    Run HTTPie and capture stderr/out and exit status.
-
-    Invoke `httpie.core.main()` with `args` and `kwargs`,
-    and return a `CLIResponse` subclass instance.
-
-    The return value is either a `StrCLIResponse`, or `BytesCLIResponse`
-    if unable to decode the output.
-
-    The response has the following attributes:
-
-        `stdout` is represented by the instance itself (print r)
-        `stderr`: text written to stderr
-        `exit_status`: the exit status
-        `json`: decoded JSON (if possible) or `None`
-
-    Exceptions are propagated.
-
-    If you pass ``error_exit_ok=True``, then error exit statuses
-    won't result into an exception.
-
-    Example:
-
-    $ http --auth=user:password GET httpbin.org/basic-auth/user/password
-
-        >>> r = http('-a', 'user:pw', 'httpbin.org/basic-auth/user/pw')
-        >>> type(r) == StrCLIResponse
-        True
-        >>> r.exit_status
-        0
-        >>> r.stderr
-        ''
-        >>> 'HTTP/1.1 200 OK' in r
-        True
-        >>> r.json == {'authenticated': True, 'user': 'user'}
-        True
-
-
-    """
-    error_exit_ok = kwargs.pop('error_exit_ok', False)
-    env = kwargs.get('env')
-    if not env:
-        env = kwargs['env'] = TestEnvironment()
-
-    stdout = env.stdout
-    stderr = env.stderr
-
-    args = list(args)
-    if '--debug' not in args and '--traceback' not in args:
-        args = ['--traceback'] + args
-
-    def dump_stderr():
-        stderr.seek(0)
-        sys.stderr.write(stderr.read())
-
-    try:
         try:
-            exit_status = main(args=args, **kwargs)
+            self.cleanup()
-            if '--download' in args:
-                # Let the progress reporter thread finish.
-                time.sleep(.5)
-        except SystemExit:
-            if error_exit_ok:
-                exit_status = httpie.ExitStatus.ERROR
-            else:
-                dump_stderr()
-                raise
         except Exception:
-            stderr.seek(0)
+            pass
-            sys.stderr.write(stderr.read())
-            raise
-        else:
-            if exit_status != httpie.ExitStatus.OK and not error_exit_ok:
-                dump_stderr()
-                raise Exception('Unexpected exit status: %s', exit_status)
-
-        stdout.seek(0)
-        stderr.seek(0)
-        output = stdout.read()
-        try:
-            output = output.decode('utf8')
-        except UnicodeDecodeError:
-            # noinspection PyArgumentList
-            r = BytesCLIResponse(output)
-        else:
-            # noinspection PyArgumentList
-            r = StrCLIResponse(output)
-        r.stderr = stderr.read()
-        r.exit_status = exit_status
-
-        if r.exit_status != httpie.ExitStatus.OK:
-            sys.stderr.write(r.stderr)
-
-        return r
-
-    finally:
-        stdout.close()
-        stderr.close()
 
 
 class BaseCLIResponse(object):
@@ -221,8 +119,8 @@ class StrCLIResponse(str, BaseCLIResponse):
             elif self.strip().startswith('{'):
                 # Looks like JSON body.
                 self._json = json.loads(self)
-            elif (self.count('Content-Type:') == 1
+            elif (self.count('Content-Type:') == 1 and
-                    and 'application/json' in self):
+                    'application/json' in self):
                 # Looks like a whole JSON HTTP message,
                 # try to extract its body.
                 try:
@@ -237,5 +135,120 @@ class StrCLIResponse(str, BaseCLIResponse):
         return self._json
 
 
-def mk_config_dir():
+class ExitStatusError(Exception):
-    return tempfile.mkdtemp(prefix='httpie_test_config_dir_')
+    pass
+
+
+def http(*args, **kwargs):
+    # noinspection PyUnresolvedReferences
+    """
+    Run HTTPie and capture stderr/out and exit status.
+
+    Invoke `httpie.core.main()` with `args` and `kwargs`,
+    and return a `CLIResponse` subclass instance.
+
+    The return value is either a `StrCLIResponse`, or `BytesCLIResponse`
+    if unable to decode the output.
+
+    The response has the following attributes:
+
+        `stdout` is represented by the instance itself (print r)
+        `stderr`: text written to stderr
+        `exit_status`: the exit status
+        `json`: decoded JSON (if possible) or `None`
+
+    Exceptions are propagated.
+
+    If you pass ``error_exit_ok=True``, then error exit statuses
+    won't result into an exception.
+
+    Example:
+
+    $ http --auth=user:password GET httpbin.org/basic-auth/user/password
+
+        >>> httpbin = getfixture('httpbin')
+        >>> r = http('-a', 'user:pw', httpbin.url + '/basic-auth/user/pw')
+        >>> type(r) == StrCLIResponse
+        True
+        >>> r.exit_status
+        0
+        >>> r.stderr
+        ''
+        >>> 'HTTP/1.1 200 OK' in r
+        True
+        >>> r.json == {'authenticated': True, 'user': 'user'}
+        True
+
+    """
+    error_exit_ok = kwargs.pop('error_exit_ok', False)
+    env = kwargs.get('env')
+    if not env:
+        env = kwargs['env'] = TestEnvironment()
+
+    stdout = env.stdout
+    stderr = env.stderr
+
+    args = list(args)
+    args_with_config_defaults = args + env.config.default_options
+    add_to_args = []
+    if '--debug' not in args_with_config_defaults:
+        if '--traceback' not in args_with_config_defaults:
+            add_to_args.append('--traceback')
+        if not any('--timeout' in arg for arg in args_with_config_defaults):
+            add_to_args.append('--timeout=3')
+    args = add_to_args + args
+
+    def dump_stderr():
+        stderr.seek(0)
+        sys.stderr.write(stderr.read())
+
+    try:
+        try:
+            exit_status = main(args=args, **kwargs)
+            if '--download' in args:
+                # Let the progress reporter thread finish.
+                time.sleep(.5)
+        except SystemExit:
+            if error_exit_ok:
+                exit_status = ExitStatus.ERROR
+            else:
+                dump_stderr()
+                raise
+        except Exception:
+            stderr.seek(0)
+            sys.stderr.write(stderr.read())
+            raise
+        else:
+            if not error_exit_ok and exit_status != ExitStatus.OK:
+                dump_stderr()
+                raise ExitStatusError(
+                    'httpie.core.main() unexpectedly returned'
+                    ' a non-zero exit status: {0} ({1})'.format(
+                        exit_status,
+                        EXIT_STATUS_LABELS[exit_status]
+                    )
+                )
+
+        stdout.seek(0)
+        stderr.seek(0)
+        output = stdout.read()
+        try:
+            output = output.decode('utf8')
+        except UnicodeDecodeError:
+            # noinspection PyArgumentList
+            r = BytesCLIResponse(output)
+        else:
+            # noinspection PyArgumentList
+            r = StrCLIResponse(output)
+        r.stderr = stderr.read()
+        r.exit_status = exit_status
+
+        if r.exit_status != ExitStatus.OK:
+            sys.stderr.write(r.stderr)
+
+        return r
+
+    finally:
+        stdout.close()
+        stderr.close()
+        env.cleanup()

tox.ini

@@ -1,21 +1,22 @@
 # Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs.
+# in multiple virtualenvs. See ./CONTRIBUTING.rst
-# Run:
-# $ pip install -r requirements-dev.txt
-# $ tox
 
 
 [tox]
-envlist = py26, py27, py34, pypy
+envlist = py26, py27, py35, pypy
 
 
 [testenv]
 deps =
+    mock
     pytest
     pytest-httpbin>=0.0.6
 
-commands =
-    py.test --verbose --doctest-modules --basetemp={envtmpdir} {posargs:./tests ./httpie}
 
-[pytest]
+commands =
-addopts = --tb=native
+    # NOTE: the order of the directories in posargs seems to matter.
+    # When changed, then many ImportMismatchError exceptions occurrs.
+    py.test \
+        --verbose \
+        --doctest-modules \
+        {posargs:./httpie ./tests}