Skip to content

Commit

Permalink
Add support for brotli decoding (#5783)
Browse files Browse the repository at this point in the history
* Add support for Brotli decoding

When the brotli or brotlicffi packages are installed,
urllib3.util.make_headers() inserts ',br' in the Accept-Encoding header
and decodes br from the answers.

* Create the default Accept-Encoding header once

* Preserve the previous delimiter behavior

* Update prose in quickstart.rst

Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
  • Loading branch information
dilyanpalauzov and sethmlarson authored Jul 7, 2021
1 parent 2463074 commit 5351469
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ dev
---

- \[Short description of non-trivial change.\]
- Requests Brotli compression, if either the `brotli` or `brotlicffi` package
is installed.

**Dependencies**

Expand Down
3 changes: 3 additions & 0 deletions docs/community/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Encoded Data?
Requests automatically decompresses gzip-encoded responses, and does
its best to decode response content to unicode when possible.

When either the `brotli <https://pypi.org/project/Brotli/>`_ or `brotlicffi <https://pypi.org/project/brotlicffi/>`_
package is installed, requests also decodes Brotli-encoded responses.

You can get direct access to the raw response (and even the socket),
if needed as well.

Expand Down
3 changes: 3 additions & 0 deletions docs/user/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ You can also access the response body as bytes, for non-text requests::

The ``gzip`` and ``deflate`` transfer-encodings are automatically decoded for you.

The ``br`` transfer-encoding is automatically decoded for you if a Brotli library
like `brotli <https://pypi.org/project/brotli>`_ or `brotlicffi <https://pypi.org/project/brotli>`_ is installed.

For example, to create an image from binary data returned by a request, you can
use the following code::

Expand Down
8 changes: 7 additions & 1 deletion requests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import warnings
import zipfile
from collections import OrderedDict
from urllib3.util import make_headers

from .__version__ import __version__
from . import certs
Expand All @@ -41,6 +42,11 @@

DEFAULT_PORTS = {'http': 80, 'https': 443}

# Ensure that ', ' is used to preserve previous delimiter behavior.
DEFAULT_ACCEPT_ENCODING = ", ".join(
re.split(r",\s*", make_headers(accept_encoding=True)["accept-encoding"])
)


if sys.platform == 'win32':
# provide a proxy_bypass version on Windows without DNS lookups
Expand Down Expand Up @@ -835,7 +841,7 @@ def default_headers():
"""
return CaseInsensitiveDict({
'User-Agent': default_user_agent(),
'Accept-Encoding': ', '.join(('gzip', 'deflate')),
'Accept-Encoding': DEFAULT_ACCEPT_ENCODING,
'Accept': '*/*',
'Connection': 'keep-alive',
})
Expand Down

0 comments on commit 5351469

Please sign in to comment.