Pulling in changes from master

.gitignore

@@ -4,5 +4,7 @@
 .mypy_cache/
 __pycache__/
 htmlcov/
+site/
 *.egg-info/
 venv/
+.nox

.travis.yml

@@ -1,19 +1,35 @@
-sudo: required
 dist: xenial
 language: python
 
 cache: pip
 
-python:
-    - "3.6"
-    - "3.7"
+branches:
+  only:
+    - master
+
+matrix:
+  include:
+    - python: 3.7
+      env: NOX_SESSION=check
+    - python: 3.7
+      env: NOX_SESSION=docs
+
+    - python: 3.6
+      env: NOX_SESSION=test-3.6
+    - python: 3.7
+      env: NOX_SESSION=test-3.7
+    - python: 3.8-dev
+      env: NOX_SESSION=test-3.8
+      dist: bionic # Required to get OpenSSL 1.1.1+
 
 install:
-    - pip install -U -r requirements.txt
+  - pip install --upgrade nox
 
 script:
-    - scripts/test
+  - nox -s ${NOX_SESSION}
 
 after_script:
-    - pip install codecov
-    - codecov
+  - if [ -f .coverage ]; then
+      python -m pip install codecov;
+      codecov --required;
+    fi

CHANGELOG.md

@@ -0,0 +1,80 @@
+# Changelog
+
+## 0.7.2 (August 28, 2019)
+
+- Enforce using `httpx.AsyncioBackend` for the synchronous client. (Pull #232)
+- `httpx.ConnectionPool` will properly release a dropped connection. (Pull #230)
+- Remove the `raise_app_exceptions` argument from `Client`. (Pull #238)
+- `DecodeError` will no longer be raised for an empty body encoded with Brotli. (Pull #237)
+- Added `http_versions` parameter to `Client`. (Pull #250)
+- Only use HTTP/1.1 on short-lived connections like `httpx.get()`. (Pull #284)
+- Convert `Client.cookies` and `Client.headers` when set as a property. (Pull #274)
+- Setting `HTTPX_DEBUG=1` enables debug logging on all requests. (Pull #277)
+
+## 0.7.1 (August 18, 2019)
+
+- Include files with source distribution to be installable. (Pull #233)
+
+## 0.7.0 (August 17, 2019)
+
+- Add the `trust_env` property to `BaseClient`. (Pull #187)
+- Add the `links` property to `BaseResponse`. (Pull #211)
+- Accept `ssl.SSLContext` instances into `SSLConfig(verify=...)`. (Pull #215)
+- Add `Response.stream_text()` with incremental encoding detection. (Pull #183)
+- Properly updated the `Host` header when a redirect changes the origin. (Pull #199)
+- Ignore invalid `Content-Encoding` headers. (Pull #196)
+- Use `~/.netrc` and `~/_netrc` files by default when `trust_env=True`. (Pull #189)
+- Create exception base class `HTTPError` with `request` and `response` properties. (Pull #162)
+- Add HSTS preload list checking within `BaseClient` to upgrade HTTP URLs to HTTPS. (Pull #184)
+- Switch IDNA encoding from IDNA 2003 to IDNA 2008. (Pull #161)
+- Expose base classes for alternate concurrency backends. (Pull #178)
+- Improve Multipart parameter encoding. (Pull #167)
+- Add the `headers` proeprty to `BaseClient`. (Pull #159)
+- Add support for Google's `brotli` library. (Pull #156)
+- Remove deprecated TLS versions (TLSv1 and TLSv1.1) from default `SSLConfig`. (Pull #155)
+- Fix `URL.join(...)` to work similarly to RFC 3986 URL joining. (Pull #144)
+
+## 0.6.8 (July 25, 2019)
+
+- Check for disconnections when searching for an available
+  connection in `ConnectionPool.keepalive_connections` (Pull #145)
+- Allow string comparison for `URL` objects (Pull #139)
+- Add HTTP status codes 418 and 451 (Pull #135)
+- Add support for client certificate passwords (Pull #118)
+- Enable post-handshake client cert authentication for TLSv1.3 (Pull #118)
+- Disable using `commonName` for hostname checking for OpenSSL 1.1.0+ (Pull #118)
+- Detect encoding for `Response.json()` (Pull #116)
+
+## 0.6.7 (July 8, 2019)
+
+- Check for connection aliveness on re-acquiry (Pull #111)
+
+## 0.6.6 (July 3, 2019)
+
+- Improve `USER_AGENT` (Pull #110)
+- Add `Connection: keep-alive` by default to HTTP/1.1 connections. (Pull #110)
+
+## 0.6.5 (June 27, 2019)
+
+- Include `Host` header by default. (Pull #109)
+- Improve HTTP protocol detection. (Pull #107)
+
+## 0.6.4 (June 25, 2019)
+
+- Implement read and write timeouts (Pull #104)
+
+## 0.6.3 (June 24, 2019)
+
+- Handle early connection closes (Pull #103)
+
+## 0.6.2 (June 23, 2019)
+
+- Use urllib3's `DEFAULT_CIPHERS` for the `SSLConfig` object. (Pull #100)
+
+## 0.6.1 (June 21, 2019)
+
+- Add support for setting a `base_url` on the `Client`.
+
+## 0.6.0 (June 21, 2019)
+
+- Honor `local_flow_control_window` for HTTP/2 connections (Pull #98)

MANIFEST.in

@@ -0,0 +1,3 @@
+include README.md
+include CHANGELOG.md
+include LICENSE.md

README.md

@@ -29,8 +29,8 @@ Let's get started...
 <Response [200 OK]>
 >>> r.status_code
 200
->>> r.protocol
-'HTTP/2'
+>>> r.http_version
+'HTTP/1.1'
 >>> r.headers['content-type']
 'text/html; charset=UTF-8'
 >>> r.text
@@ -65,7 +65,7 @@ Plus all the standard features of `requests`...
 * HTTP(S) Proxy Support *(TODO)*
 * Connection Timeouts
 * Streaming Downloads
-* .netrc Support *(TODO)*
+* .netrc Support
 * Chunked Requests
 
 ## Installation
@@ -90,6 +90,10 @@ the specific topics on making [Parallel Requests](https://www.encode.io/httpx/pa
 
 The [Developer Interface](https://www.encode.io/httpx/api/) provides a comprehensive API reference.
 
+## Contribute
+
+If you want to contribute with HTTPX check out the [Contributing Guide](https://www.encode.io/httpx/contributing/) to learn how to start.
+
 ## Dependencies
 
 The httpx project relies on these excellent libraries:

codecov.yml

@@ -0,0 +1,8 @@
+coverage:
+    status:
+        patch:
+            default:
+                target: '100'
+        project:
+            default:
+                target: '100'

docs/advanced.md

@@ -41,3 +41,46 @@ r = client.get('http://example/')
 assert r.status_code == 200
 assert r.text == "Hello World!"
 ```
+
+For some more complex cases you might need to customize the WSGI or ASGI
+dispatch. This allows you to:
+
+* Inspect 500 error responses, rather than raise exceptions, by setting `raise_app_exceptions=False`.
+* Mount the WSGI or ASGI application at a subpath, by setting `script_name` (WSGI) or `root_path` (ASGI).
+* Use a given the client address for requests, by setting `remote_addr` (WSGI) or `client` (ASGI).
+
+For example:
+
+```python
+# Instantiate a client that makes WSGI requests with a client IP of "1.2.3.4".
+dispatch = httpx.WSGIDispatch(app=app, remote_addr="1.2.3.4")
+client = httpx.Client(dispatch=dispatch)
+```
+
+## .netrc Support
+
+HTTPX supports .netrc file. In `trust_env=True` cases, if auth parameter is
+not defined, HTTPX tries to add auth into request's header from .netrc file.
+
+As default `trust_env` is true. To set false:
+```python
+>>> httpx.get('https://example.org/', trust_env=False)
+```
+
+If `NETRC` environment is empty, HTTPX tries to use default files.
+(`~/.netrc`, `~/_netrc`)
+
+To change `NETRC` environment:
+```python
+>>> import os
+>>> os.environ["NETRC"] = "my_default_folder/.my_netrc"
+```
+
+.netrc file content example:
+```
+machine netrcexample.org
+login example-username
+password example-password
+
+...
+```

docs/api.md

@@ -1,6 +1,12 @@
 # Developer Interface
 
-## Main Interface
+## Helper Functions
+
+!!! note
+    Only use these functions if you're testing HTTPX in a console
+    or making a small number of requests. Using a `Client` will
+    enable HTTP/2 and connection pooling for more efficient and
+    long-lived connections.
 
 * `get(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [verify], [cert], [timeout])`
 * `options(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [verify], [cert], [timeout])`
@@ -13,14 +19,16 @@
 
 ## `Client`
 
-*An HTTP client, with connection pooling, redirects, cookie persistence, etc.*
+*An HTTP client, with connection pooling, HTTP/2, redirects, cookie persistence, etc.*
 
 ```python
 >>> client = httpx.Client()
 >>> response = client.get('https://example.org')
 ```
 
-* `def __init__([auth], [cookies], [verify], [cert], [timeout], [pool_limits], [max_redirects], [app], [dispatch])`
+* `def __init__([auth], [headers], [cookies], [verify], [cert], [timeout], [pool_limits], [max_redirects], [app], [dispatch])`
+* `.headers` - **Headers**
+* `.cookies` - **Cookies**
 * `def .get(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [verify], [cert], [timeout])`
 * `def .options(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [verify], [cert], [timeout])`
 * `def .head(url, [params], [headers], [cookies], [auth], [stream], [allow_redirects], [verify], [cert], [timeout])`
@@ -39,7 +47,7 @@
 * `def __init__(...)`
 * `.status_code` - **int**
 * `.reason_phrase` - **str**
-* `.protocol` - `"HTTP/2"` or `"HTTP/1.1"`
+* `.http_version` - `"HTTP/2"` or `"HTTP/1.1"`
 * `.url` - **URL**
 * `.headers` - **Headers**
 * `.content` - **bytes**
@@ -110,6 +118,7 @@ True
 ```
 
 * `def __init__(url)`
+* `.scheme` - **str**
 * `.is_ssl` - **bool**
 * `.host` - **str**
 * `.port` - **int**

docs/contributing.md

@@ -0,0 +1,116 @@
+# Contributing
+
+Thank you for being interested in contributing with HTTPX.
+There are many ways you can contribute with the project:
+
+- Try HTTPX and [report bugs/issues you find](https://github.com/encode/httpx/issues/new)
+- [Implement new features](https://github.com/encode/httpx/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
+- [Review Pull Requests of others](https://github.com/encode/httpx/pulls)
+- Write documentation
+- Participate in discussions
+
+## Reporting Bugs or Other Issues
+
+Found something that HTTPX should support?
+Stumbled upon some unexpected behavior?
+
+Feel free to open an issue at the
+[issue tracker](https://github.com/encode/httpx/issues).
+Try to be more descriptive as you can and in case of a bug report,
+provide as much information as possible like:
+
+- OS platform
+- Python version
+- Installed dependencies and versions (`python -m pip freeze`)
+- Code snippet
+- Error traceback
+
+## Development
+
+To start developing HTTPX create a **fork** of the
+[HTTPX repository](https://github.com/encode/httpx) on GitHub.
+
+Then clone your fork with the following command replacing `YOUR-USERNAME` with
+your GitHub username:
+
+```shell
+$ git clone https://github.com/YOUR-USERNAME/httpx
+```
+
+With the repository cloned you can access its folder, set up the
+virtual environment, install the project requirements,
+and then install HTTPX on edit mode:
+
+```shell
+$ cd httpx
+$ python3 -m venv venv
+$ source venv/bin/activate
+$ pip install -r test-requirements.txt
+$ pip install -e .
+```
+
+!!! note
+    Feel free to replace this step with your development environment setup
+    (pyenv, pipenv, virtualenvwrapper, docker, etc).
+
+## Testing and Linting
+
+We use [nox](https://nox.thea.codes/en/stable/) to automate testing, linting,
+and documentation building workflow. Make sure you have it installed
+at your system before starting.
+
+Install nox with:
+
+```shell
+$ python3 -m pip install --user nox
+```
+
+Alternatively, use [pipx](https://github.com/pipxproject/pipx) if you prefer
+to keep it into an isolated environment:
+
+```shell
+$ pipx install nox
+```
+
+Now, with nox installed run the complete pipeline with:
+
+```shell
+$ nox
+```
+
+!!! warning
+    The test suite spawns a testing server at the port **8000**.
+    Make sure this isn't being used, so the tests can run properly.
+
+To run the code auto-formatting separately:
+
+```shell
+$ nox -s lint
+```
+
+Also, if you need to run the tests only:
+
+```shell
+$ nox -s test
+```
+
+You can also run a single test script like this:
+
+```shell
+$ nox -s test -- tests/test_multipart.py
+```
+
+## Documenting
+
+To work with the documentation, make sure you have `mkdocs` and
+`mkdocs-material` installed on your environment:
+
+```shell
+$ pip install mkdocs mkdocs-material
+```
+
+To spawn the docs server run:
+
+```shell
+$ mkdocs serve
+```