Skip to content

Commit

Permalink
Revert "Add support for brotli decoding (psf#5783)"
Browse files Browse the repository at this point in the history
This reverts commit 5351469.
  • Loading branch information
gdubicki committed Jul 7, 2021
1 parent 33cf965 commit c815fb0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 15 deletions.
2 changes: 0 additions & 2 deletions HISTORY.md
Expand Up @@ -5,8 +5,6 @@ dev
---

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

**Dependencies**

Expand Down
3 changes: 0 additions & 3 deletions docs/community/faq.rst
Expand Up @@ -11,9 +11,6 @@ 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: 0 additions & 3 deletions docs/user/quickstart.rst
Expand Up @@ -128,9 +128,6 @@ 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: 1 addition & 7 deletions requests/utils.py
Expand Up @@ -20,7 +20,6 @@
import warnings
import zipfile
from collections import OrderedDict
from urllib3.util import make_headers

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

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 @@ -841,7 +835,7 @@ def default_headers():
"""
return CaseInsensitiveDict({
'User-Agent': default_user_agent(),
'Accept-Encoding': DEFAULT_ACCEPT_ENCODING,
'Accept-Encoding': ', '.join(('gzip', 'deflate')),
'Accept': '*/*',
'Connection': 'keep-alive',
})
Expand Down

0 comments on commit c815fb0

Please sign in to comment.