From c815fb0449005f0bec5ab467ef7a58132bc294db Mon Sep 17 00:00:00 2001 From: Greg Dubicki Date: Wed, 7 Jul 2021 16:47:22 +0200 Subject: [PATCH] Revert "Add support for brotli decoding (#5783)" This reverts commit 5351469472eccee7ed1a6cae53341446c520d807. --- HISTORY.md | 2 -- docs/community/faq.rst | 3 --- docs/user/quickstart.rst | 3 --- requests/utils.py | 8 +------- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 6a6040c974..9b08a7f2d6 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,8 +5,6 @@ dev --- - \[Short description of non-trivial change.\] -- Requests Brotli compression, if either the `brotli` or `brotlicffi` package - is installed. **Dependencies** diff --git a/docs/community/faq.rst b/docs/community/faq.rst index 19732aedac..c0177719bd 100644 --- a/docs/community/faq.rst +++ b/docs/community/faq.rst @@ -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 `_ or `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. diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst index b4649f00d5..0e2bcadfdc 100644 --- a/docs/user/quickstart.rst +++ b/docs/user/quickstart.rst @@ -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 `_ or `brotlicffi `_ is installed. - For example, to create an image from binary data returned by a request, you can use the following code:: diff --git a/requests/utils.py b/requests/utils.py index dbb02a0d79..6705c9a300 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -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 @@ -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 @@ -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', })