Pass urllib3.SKIP_HEADER when headers should be unset

urllib3 introduced some default headers and a way to skip them if
desired. Let's use that sentinel value to pass along information about
Requests' users desire to skip those headers as well.

Closes gh-5671

.coveragerc

@@ -1,2 +1,2 @@
 [run]
-omit = requests/packages/*
+omit = requests/packages/*

.git-blame-ignore-revs

@@ -1,5 +0,0 @@
-# You can configure git to automatically use this file with the following config:
-# git config --global blame.ignoreRevsFile .git-blame-ignore-revs
-
-# Add automatic code formatting to Requests
-2a6f290bc09324406708a4d404a88a45d848ddf9

.github/CODE_OF_CONDUCT.md

@@ -1,6 +1,3 @@
-# Treat each other well
+Be cordial or be on your way.
 
-Everyone participating in the _requests_ project, and in particular in the issue tracker,
-pull requests, and social media activity, is expected to treat other people with respect
-and more generally to follow the guidelines articulated in the
-[Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/).
+https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way

.github/ISSUE_TEMPLATE.md

@@ -25,4 +25,4 @@ import requests
 
 This command is only available on Requests v2.16.4 and greater. Otherwise,
 please provide some basic information about your system (Python version,
-operating system, &c).
+operating system, &c).

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -4,15 +4,15 @@ about: Create a report to help us improve
 
 ---
 
-<!-- Summary. -->
+Summary.
 
 ## Expected Result
 
-<!-- What you expected. -->
+What you expected.
 
 ## Actual Result
 
-<!-- What happened instead. -->
+What happened instead.
 
 ## Reproduction Steps
 
@@ -25,12 +25,10 @@ import requests
 
     $ python -m requests.help
 
-```json
-{
-  "paste": "here"
-}
+```
+<paste here>
 ```
 
-<!-- This command is only available on Requests v2.16.4 and greater. Otherwise,
+This command is only available on Requests v2.16.4 and greater. Otherwise,
 please provide some basic information about your system (Python version,
-operating system, &c). -->
+operating system, &c).

.github/workflows/codeql-analysis.yml

@@ -7,22 +7,15 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [master]
   schedule:
     - cron: '0 23 * * 0'
 
-permissions:
-  contents: read
-
 jobs:
   analyze:
-    permissions:
-      actions: read  # for github/codeql-action/init to get workflow details
-      contents: read  # for actions/checkout to fetch code
-      security-events: write  # for github/codeql-action/autobuild to send a status report
     name: Analyze
     runs-on: ubuntu-latest
 
@@ -49,7 +42,7 @@ jobs:
       with:
         languages: "python"
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
+        # By default, queries listed here will override any specified in a config file. 
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 

.github/workflows/lint.yml

@@ -1,19 +0,0 @@
-name: Lint code
-
-on:
-  push:
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  lint:
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-    - name: Run pre-commit
-      uses: pre-commit/action@v3.0.0

.github/workflows/lock-issues.yml

@@ -1,19 +0,0 @@
-name: 'Lock Threads'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  action:
-    if: github.repository_owner == 'psf'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v3
-        with:
-            issue-lock-inactive-days: 90
-            pr-lock-inactive-days: 90

.github/workflows/run-tests.yml

@@ -2,24 +2,20 @@ name: Tests
 
 on: [push, pull_request]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
+
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
         os: [ubuntu-18.04, macOS-latest, windows-latest]
         include:
-          # pypy-3.7 on Mac OS currently fails trying to compile
+          # pypy3 on Mac OS currently fails trying to compile
           # brotlipy. Moving pypy3 to only test linux.
-          - python-version: pypy-3.7
+          - python-version: pypy3
             os: ubuntu-latest
-            experimental: false
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -23,12 +23,6 @@ env/
 
 .workon
 
-# in case you work with IntelliJ/PyCharm
-.idea
-*.iml
-.python-version
-
-
 t.py
 
 t2.py

.pre-commit-config.yaml

@@ -1,28 +0,0 @@
-exclude: 'docs/|ext/'
-
-repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.0.1
-  hooks:
-  - id: check-yaml
-  - id: debug-statements
-  - id: end-of-file-fixer
-  - id: trailing-whitespace
-- repo: https://github.com/PyCQA/isort
-  rev: 5.10.1
-  hooks:
-    - id: isort
-- repo: https://github.com/psf/black
-  rev: 22.3.0
-  hooks:
-    - id: black
-      exclude: tests/test_lowlevel.py
-- repo: https://github.com/asottile/pyupgrade
-  rev: v2.31.1
-  hooks:
-    - id: pyupgrade
-      args: [--py37-plus]
-- repo: https://github.com/PyCQA/flake8
-  rev: 6.0.0
-  hooks:
-    - id: flake8

AUTHORS.rst

@@ -191,4 +191,3 @@ Patches and Suggestions
 - "Dull Bananas" <dull.bananas0@gmail.com> (`@dullbananas <https://github.com/dullbananas>`_)
 - Alessio Izzo (`@aless10 <https://github.com/aless10>`_)
 - Sylvain Marié (`@smarie <https://github.com/smarie>`_)
-- Hod Bin Noon (`@hodbn <https://github.com/hodbn>`_)

HISTORY.md

@@ -4,172 +4,11 @@ Release History
 dev
 ---
 
-- \[Short description of non-trivial change.\]
+-   \[Short description of non-trivial change.\]
 
 
-2.28.2 (2023-01-12)
--------------------
-
-**Dependencies**
-
-- Requests now supports charset\_normalizer 3.x. (#6261)
-
-**Bugfixes**
-
-- Updated MissingSchema exception to suggest https scheme rather than http. (#6188)
-
-2.28.1 (2022-06-29)
--------------------
-
-**Improvements**
-
-- Speed optimization in `iter_content` with transition to `yield from`. (#6170)
-
-**Dependencies**
-
-- Added support for chardet 5.0.0 (#6179)
-- Added support for charset-normalizer 2.1.0 (#6169)
-
-2.28.0 (2022-06-09)
--------------------
-
-**Deprecations**
-
-- ⚠️ Requests has officially dropped support for Python 2.7. ⚠️ (#6091)
-- Requests has officially dropped support for Python 3.6 (including pypy3.6). (#6091)
-
-**Improvements**
-
-- Wrap JSON parsing issues in Request's JSONDecodeError for payloads without
-  an encoding to make `json()` API consistent. (#6097)
-- Parse header components consistently, raising an InvalidHeader error in
-  all invalid cases. (#6154)
-- Added provisional 3.11 support with current beta build. (#6155)
-- Requests got a makeover and we decided to paint it black. (#6095)
-
-**Bugfixes**
-
-- Fixed bug where setting `CURL_CA_BUNDLE` to an empty string would disable
-  cert verification. All Requests 2.x versions before 2.28.0 are affected. (#6074)
-- Fixed urllib3 exception leak, wrapping `urllib3.exceptions.SSLError` with
-  `requests.exceptions.SSLError` for `content` and `iter_content`. (#6057)
-- Fixed issue where invalid Windows registry entires caused proxy resolution
-  to raise an exception rather than ignoring the entry. (#6149)
-- Fixed issue where entire payload could be included in the error message for
-  JSONDecodeError. (#6036)
-
-2.27.1 (2022-01-05)
--------------------
-
-**Bugfixes**
-
-- Fixed parsing issue that resulted in the `auth` component being
-  dropped from proxy URLs. (#6028)
-
-2.27.0 (2022-01-03)
--------------------
-
-**Improvements**
-
-- Officially added support for Python 3.10. (#5928)
-
-- Added a `requests.exceptions.JSONDecodeError` to unify JSON exceptions between
-  Python 2 and 3. This gets raised in the `response.json()` method, and is
-  backwards compatible as it inherits from previously thrown exceptions.
-  Can be caught from `requests.exceptions.RequestException` as well. (#5856)
-
-- Improved error text for misnamed `InvalidSchema` and `MissingSchema`
-  exceptions. This is a temporary fix until exceptions can be renamed
-  (Schema->Scheme). (#6017)
-
-- Improved proxy parsing for proxy URLs missing a scheme. This will address
-  recent changes to `urlparse` in Python 3.9+. (#5917)
-
-**Bugfixes**
-
-- Fixed defect in `extract_zipped_paths` which could result in an infinite loop
-  for some paths. (#5851)
-
-- Fixed handling for `AttributeError` when calculating length of files obtained
-  by `Tarfile.extractfile()`. (#5239)
-
-- Fixed urllib3 exception leak, wrapping `urllib3.exceptions.InvalidHeader` with
-  `requests.exceptions.InvalidHeader`. (#5914)
-
-- Fixed bug where two Host headers were sent for chunked requests. (#5391)
-
-- Fixed regression in Requests 2.26.0 where `Proxy-Authorization` was
-  incorrectly stripped from all requests sent with `Session.send`. (#5924)
-
-- Fixed performance regression in 2.26.0 for hosts with a large number of
-  proxies available in the environment. (#5924)
-
-- Fixed idna exception leak, wrapping `UnicodeError` with
-  `requests.exceptions.InvalidURL` for URLs with a leading dot (.) in the
-  domain. (#5414)
-
-**Deprecations**
-
-- Requests support for Python 2.7 and 3.6 will be ending in 2022. While we
-  don't have exact dates, Requests 2.27.x is likely to be the last release
-  series providing support.
-
-2.26.0 (2021-07-13)
--------------------
-
-**Improvements**
-
-- Requests now supports Brotli compression, if either the `brotli` or
-  `brotlicffi` package is installed. (#5783)
-
-- `Session.send` now correctly resolves proxy configurations from both
-  the Session and Request. Behavior now matches `Session.request`. (#5681)
-
-**Bugfixes**
-
-- Fixed a race condition in zip extraction when using Requests in parallel
-  from zip archive. (#5707)
-
-**Dependencies**
-
-- Instead of `chardet`, use the MIT-licensed `charset_normalizer` for Python3
-  to remove license ambiguity for projects bundling requests. If `chardet`
-  is already installed on your machine it will be used instead of `charset_normalizer`
-  to keep backwards compatibility. (#5797)
-
-  You can also install `chardet` while installing requests by
-  specifying `[use_chardet_on_py3]` extra as follows:
-
-    ```shell
-    pip install "requests[use_chardet_on_py3]"
-    ```
-
-  Python2 still depends upon the `chardet` module.
-
-- Requests now supports `idna` 3.x on Python 3. `idna` 2.x will continue to
-  be used on Python 2 installations. (#5711)
-
-**Deprecations**
-
-- The `requests[security]` extra has been converted to a no-op install.
-  PyOpenSSL is no longer the recommended secure option for Requests. (#5867)
-
-- Requests has officially dropped support for Python 3.5. (#5867)
-
-2.25.1 (2020-12-16)
--------------------
-
-**Bugfixes**
-
-- Requests now treats `application/json` as `utf8` by default. Resolving
-  inconsistencies between `r.text` and `r.json` output. (#5673)
-
-**Dependencies**
-
-- Requests now supports chardet v4.x.
-
 2.25.0 (2020-11-11)
--------------------
+------------------
 
 **Improvements**
 
@@ -216,7 +55,7 @@ dev
 **Dependencies**
 
 - Pinning for `chardet` and `idna` now uses major version instead of minor.
-  This hopefully reduces the need for releases every time a dependency is updated.
+  This hopefully reduces the need for releases everytime a dependency is updated.
 
 2.22.0 (2019-05-15)
 -------------------
@@ -571,7 +410,7 @@ Or, even better:
 
 -   Fixed regression from 2.12.2 where non-string types were rejected in
     the basic auth parameters. While support for this behaviour has been
-    re-added, the behaviour is deprecated and will be removed in the
+    readded, the behaviour is deprecated and will be removed in the
     future.
 
 2.12.3 (2016-12-01)
@@ -1805,12 +1644,12 @@ This is not a backwards compatible change.
 -   Automatic Authentication API Change
 -   Smarter Query URL Parameterization
 -   Allow file uploads and POST data together
--
+-   
 
     New Authentication Manager System
 
     :   -   Simpler Basic HTTP System
-        -   Supports all built-in urllib2 Auths
+        -   Supports all build-in urllib2 Auths
         -   Allows for custom Auth Handlers
 
 0.2.4 (2011-02-19)
@@ -1824,7 +1663,7 @@ This is not a backwards compatible change.
 0.2.3 (2011-02-15)
 ------------------
 
--
+-   
 
     New HTTPHandling Methods
 
@@ -1857,3 +1696,4 @@ This is not a backwards compatible change.
 
 -   Frustration
 -   Conception
+

Makefile

@@ -1,9 +1,10 @@
 .PHONY: docs
 init:
+	pip install -e .[socks]
 	pip install -r requirements-dev.txt
 test:
-	# This runs all of the tests on all supported Python versions.
-	tox -p
+	# This runs all of the tests, on both Python 2 and Python 3.
+	detox
 ci:
 	pytest tests --junitxml=report.xml
 

README.md

@@ -1,10 +1,10 @@
 # Requests
 
-**Requests** is a simple, yet elegant, HTTP library.
+**Requests** is a simple, yet elegant HTTP library.
 
 ```python
 >>> import requests
->>> r = requests.get('https://httpbin.org/basic-auth/user/pass', auth=('user', 'pass'))
+>>> r = requests.get('https://api.github.com/user', auth=('user', 'pass'))
 >>> r.status_code
 200
 >>> r.headers['content-type']
@@ -12,16 +12,16 @@
 >>> r.encoding
 'utf-8'
 >>> r.text
-'{"authenticated": true, ...'
+'{"type":"User"...'
 >>> r.json()
-{'authenticated': True, ...}
+{'disk_usage': 368627, 'private_gists': 484, ...}
 ```
 
 Requests allows you to send HTTP/1.1 requests extremely easily. There’s no need to manually add query strings to your URLs, or to form-encode your `PUT` & `POST` data — but nowadays, just use the `json` method!
 
-Requests is one of the most downloaded Python packages today, pulling in around `30M downloads / week`— according to GitHub, Requests is currently [depended upon](https://github.com/psf/requests/network/dependents?package_id=UGFja2FnZS01NzA4OTExNg%3D%3D) by `1,000,000+` repositories. You may certainly put your trust in this code.
+Requests is one of the most downloaded Python package today, pulling in around `14M downloads / week`— according to GitHub, Requests is currently [depended upon](https://github.com/psf/requests/network/dependents?package_id=UGFja2FnZS01NzA4OTExNg%3D%3D) by `500,000+` repositories. You may certainly put your trust in this code.
 
-[![Downloads](https://pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)
+[![Downloads](https://pepy.tech/badge/requests/month)](https://pepy.tech/project/requests/month)
 [![Supported Versions](https://img.shields.io/pypi/pyversions/requests.svg)](https://pypi.org/project/requests)
 [![Contributors](https://img.shields.io/github/contributors/psf/requests.svg)](https://github.com/psf/requests/graphs/contributors)
 
@@ -33,7 +33,7 @@ Requests is available on PyPI:
 $ python -m pip install requests
 ```
 
-Requests officially supports Python 3.7+.
+Requests officially supports Python 2.7 & 3.5+.
 
 ## Supported Features & Best–Practices
 
@@ -55,24 +55,8 @@ Requests is ready for the demands of building robust and reliable HTTP–speakin
 
 ## API Reference and User Guide available on [Read the Docs](https://requests.readthedocs.io)
 
-[![Read the Docs](https://raw.githubusercontent.com/psf/requests/main/ext/ss.png)](https://requests.readthedocs.io)
-
-## Cloning the repository
-
-When cloning the Requests repository, you may need to add the `-c
-fetch.fsck.badTimezone=ignore` flag to avoid an error about a bad commit (see
-[this issue](https://github.com/psf/requests/issues/2690) for more background):
-
-```shell
-git clone -c fetch.fsck.badTimezone=ignore https://github.com/psf/requests.git
-```
-
-You can also apply this setting to your global Git config:
-
-```shell
-git config --global fetch.fsck.badTimezone ignore
-```
+[![Read the Docs](https://raw.githubusercontent.com/psf/requests/master/ext/ss.png)](https://requests.readthedocs.io)
 
 ---
 
-[![Kenneth Reitz](https://raw.githubusercontent.com/psf/requests/main/ext/kr.png)](https://kennethreitz.org) [![Python Software Foundation](https://raw.githubusercontent.com/psf/requests/main/ext/psf.png)](https://www.python.org/psf)
+[![Kenneth Reitz](https://raw.githubusercontent.com/psf/requests/master/ext/kr.png)](https://kennethreitz.org) [![Python Software Foundation](https://raw.githubusercontent.com/psf/requests/master/ext/psf.png)](https://www.python.org/psf)

docs/_templates/sidebarintro.html

@@ -1,18 +1,40 @@
-<p class="logo">
-  <a href="{{ pathto(master_doc) }}">
-    <img class="logo" src="{{ pathto('_static/requests-sidebar.png', 1) }}" alt="Requests logo" />
-  </a>
-</p>
-
 <p>
   <iframe src="https://ghbtns.com/github-btn.html?user=psf&repo=requests&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<style>
+  .algolia-autocomplete {
+    width: 100%;
+    height: 1.5em
+  }
+
+  .algolia-autocomplete a {
+    border-bottom: none !important;
+  }
+
+  #doc_search {
+    width: 100%;
+    height: 100%;
+  }
+</style>
+<input id="doc_search" placeholder="Search the doc" autofocus />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" onload="docsearch({
+  apiKey: 'f177061e2354c50a97bfc635e827ffab',
+  indexName: 'python-requests',
+  inputSelector: '#doc_search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+})" async></script>
 
 <p>
   Requests is an elegant and simple HTTP library for Python, built for
   human beings.
 </p>
+<p>Sponsored by <strong><a href="https://www.govcert.lu">CERT Gouvernemental - GOVCERT.LU</a></strong>.</p>
+
+<script async type="text/javascript"
+  src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=CKYI5K3E&placement=pythonrequestsorg"
+  id="_carbonads_js"></script>
 
 <h3>Useful Links</h3>
 <ul>
@@ -33,5 +55,19 @@
   <li><a href="https://github.com/psf/requests/issues">Issue Tracker</a></li>
 </ul>
 
+
+<h3>Translations</h3>
+
+<ul>
+  <li><a href="https://requests.readthedocs.io/">English</a></li>
+  <li><a href="https://fr.python-requests.org/">French</a></li>
+  <li><a href="https://de.python-requests.org/">German</a></li>
+  <li><a href="https://jp.python-requests.org/">Japanese</a></li>
+  <li><a href="https://cn.python-requests.org/">Chinese</a></li>
+  <li><a href="https://pt.python-requests.org/">Portuguese</a></li>
+  <li><a href="https://it.python-requests.org/">Italian</a></li>
+  <li><a href="https://es.python-requests.org/">Spanish</a></li>
+</ul>
+
 <div id="native-ribbon">
 </div>

docs/_templates/sidebarlogo.html

@@ -2,6 +2,29 @@
   <iframe src="https://ghbtns.com/github-btn.html?user=psf&repo=requests&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<style>
+  .algolia-autocomplete {
+    width: 100%;
+    height: 1.5em
+  }
+
+  .algolia-autocomplete a {
+    border-bottom: none !important;
+  }
+
+  #doc_search {
+    width: 100%;
+    height: 100%;
+  }
+</style>
+<input id="doc_search" placeholder="Search the doc" autofocus />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" onload="docsearch({
+  apiKey: 'f177061e2354c50a97bfc635e827ffab',
+  indexName: 'python-requests',
+  inputSelector: '#doc_search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+})" async></script>
 
 <p>
   Requests is an elegant and simple HTTP library for Python, built for
@@ -9,6 +32,12 @@
   development release.
 </p>
 
+<p>Sponsored by <strong><a href="https://www.govcert.lu">CERT Gouvernemental - GOVCERT.LU</a></strong>.</p>
+
+  <script async type="text/javascript"
+    src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg"
+    id="_carbonads_js"></script>
+
 <h3>Useful Links</h3>
 <ul>
   <li><a href="https://requests.readthedocs.io/en/latest/user/quickstart/">Quickstart</a></li>
@@ -28,3 +57,15 @@
   <li><a href="https://github.com/psf/requests/issues">Issue Tracker</a></li>
 </ul>
 
+  <h3>Translations</h3>
+
+  <ul>
+    <li><a href="https://requests.readthedocs.io/">English</a></li>
+    <li><a href="https://fr.python-requests.org/">French</a></li>
+    <li><a href="https://de.python-requests.org/">German</a></li>
+    <li><a href="https://jp.python-requests.org/">Japanese</a></li>
+    <li><a href="https://cn.python-requests.org/">Chinese</a></li>
+    <li><a href="https://pt.python-requests.org/">Portuguese</a></li>
+    <li><a href="https://it.python-requests.org/">Italian</a></li>
+    <li><a href="https://es.python-requests.org/">Spanish</a></li>
+  </ul>

docs/api.rst

@@ -36,7 +36,6 @@ Exceptions
 .. autoexception:: requests.ConnectTimeout
 .. autoexception:: requests.ReadTimeout
 .. autoexception:: requests.Timeout
-.. autoexception:: requests.JSONDecodeError
 
 
 Request Sessions
@@ -128,7 +127,7 @@ API Changes
   ::
 
       import requests
-      r = requests.get('https://api.github.com/events')
+      r = requests.get('https://github.com/timeline.json')
       r.json()   # This *call* raises an exception if JSON decoding fails
 
 * The ``Session`` API has changed. Sessions objects no longer take parameters.
@@ -157,7 +156,7 @@ API Changes
   ::
 
       # in 0.x, passing prefetch=False would accomplish the same thing
-      r = requests.get('https://api.github.com/events', stream=True)
+      r = requests.get('https://github.com/timeline.json', stream=True)
       for chunk in r.iter_content(8192):
           ...
 

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 <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.
 
@@ -22,7 +19,7 @@ Custom User-Agents?
 -------------------
 
 Requests allows you to easily override User-Agent strings, along with
-any other HTTP Header. See `documentation about headers <https://requests.readthedocs.io/en/latest/user/quickstart/#custom-headers>`_.
+any other HTTP Header. See `documentation about headers <https://requests.readthedocs.io/en/master/user/quickstart/#custom-headers>`_.
 
 
 
@@ -55,16 +52,19 @@ Chris Adams gave an excellent summary on
 Python 3 Support?
 -----------------
 
-Yes! Requests officially supports Python 3.7+ and PyPy.
+Yes! Requests officially supports Python 2.7 & 3.5+ and PyPy.
 
 Python 2 Support?
 -----------------
 
-No! As of Requests 2.28.0, Requests no longer supports Python 2.7. Users who
-have been unable to migrate should pin to `requests<2.28`. Full information
-can be found in `psf/requests#6023 <https://github.com/psf/requests/issues/6023>`_.
+Yes! We do not have immediate plans to `sunset
+<https://www.python.org/doc/sunset-python-2/>`_ our support for Python
+2.7. We understand that we have a large user base with varying needs,
+and intend to maintain Python 2.7 support within Requests until `pip
+stops supporting Python 2.7 (there's no estimated date on that yet)
+<https://pip.pypa.io/en/latest/development/release-process/#python-2-support>`_.
 
-It is *highly* recommended users migrate to Python 3.8+ now since Python
+That said, it is *highly* recommended users migrate to Python 3.6+ since Python
 2.7 is no longer receiving bug fixes or security updates as of January 1, 2020.
 
 What are "hostname doesn't match" errors?
@@ -83,7 +83,10 @@ when servers are using `Virtual Hosting`_. When such servers are hosting
 more than one SSL site they need to be able to return the appropriate
 certificate based on the hostname the client is connecting to.
 
-Python 3 already includes native support for SNI in their SSL modules.
+Python3 and Python 2.7.9+ include native support for SNI in their SSL modules.
+For information on using SNI with Requests on Python < 2.7.9 refer to this
+`Stack Overflow answer`_.
 
 .. _`Server-Name-Indication`: https://en.wikipedia.org/wiki/Server_Name_Indication
 .. _`virtual hosting`: https://en.wikipedia.org/wiki/Virtual_hosting
+.. _`Stack Overflow answer`: https://stackoverflow.com/questions/18578439/using-requests-with-tls-doesnt-give-sni-support/18579484#18579484

docs/community/recommended.rst

@@ -59,4 +59,4 @@ Betamax
 `Betamax`_ records your HTTP interactions so the NSA does not have to.
 A VCR imitation designed only for Python-Requests.
 
-.. _betamax: https://github.com/betamaxpy/betamax
+.. _betamax: https://github.com/sigmavirus24/betamax

docs/community/vulnerabilities.rst

@@ -72,7 +72,7 @@ time, to ensure that they are able to promptly release their downstream
 packages. Currently the list of people we actively contact *ahead of a public
 release* is:
 
-- Python Maintenance Team, Red Hat (python-maint@redhat.com)
+- Jeremy Cline, Red Hat (@jeremycline)
 - Daniele Tricoli, Debian (@eriol)
 
 We will notify these individuals at least a week ahead of our planned release

docs/dev/contributing.rst

@@ -34,7 +34,7 @@ including reporting bugs or requesting features. This golden rule is
 **All contributions are welcome**, as long as
 everyone involved is treated with respect.
 
-.. _be cordial or be on your way: https://kenreitz.org/essays/2013/01/27/be-cordial-or-be-on-your-way
+.. _be cordial or be on your way: https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way
 
 .. _early-feedback:
 
@@ -78,7 +78,7 @@ When contributing code, you'll want to follow this checklist:
 4. Make your change.
 5. Run the entire test suite again, confirming that all tests pass *including
    the ones you just added*.
-6. Send a GitHub Pull Request to the main repository's ``main`` branch.
+6. Send a GitHub Pull Request to the main repository's ``master`` branch.
    GitHub Pull Requests are the expected method of code collaboration on this
    project.
 
@@ -93,21 +93,6 @@ event that you object to the code review feedback, you should make your case
 clearly and calmly. If, after doing so, the feedback is judged to still apply,
 you must either apply the feedback or withdraw your contribution.
 
-Code Style
-~~~~~~~~~~
-
-Requests uses a collection of tools to ensure the code base has a consistent
-style as it grows. We have these orchestrated using a tool called
-`pre-commit`_. This can be installed locally and run over your changes prior
-to opening a PR, and will also be run as part of the CI approval process
-before a change is merged.
-
-You can find the full list of formatting requirements specified in the
-`.pre-commit-config.yaml`_ at the top level directory of Requests.
-
-.. _pre-commit: https://pre-commit.com/
-.. _.pre-commit-config.yaml: https://github.com/psf/requests/blob/main/.pre-commit-config.yaml
-
 New Contributors
 ~~~~~~~~~~~~~~~~
 
@@ -118,6 +103,62 @@ asking for help.
 
 Please also check the :ref:`early-feedback` section.
 
+Kenneth Reitz's Code Style™
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Requests codebase uses the `PEP 8`_ code style.
+
+In addition to the standards outlined in PEP 8, we have a few guidelines:
+
+- Line-length can exceed 79 characters, to 100, when convenient.
+- Line-length can exceed 100 characters, when doing otherwise would be *terribly* inconvenient.
+- Always use single-quoted strings (e.g. ``'#flatearth'``), unless a single-quote occurs within the string.
+
+Additionally, one of the styles that PEP8 recommends for `line continuations`_
+completely lacks all sense of taste, and is not to be permitted within
+the Requests codebase::
+
+    # Aligned with opening delimiter.
+    foo = long_function_name(var_one, var_two,
+                             var_three, var_four)
+
+No. Just don't. Please. This is much better::
+
+    foo = long_function_name(
+        var_one,
+        var_two,
+        var_three,
+        var_four,
+    )
+
+Docstrings are to follow the following syntaxes::
+
+    def the_earth_is_flat():
+        """NASA divided up the seas into thirty-three degrees."""
+        pass
+
+::
+
+    def fibonacci_spiral_tool():
+        """With my feet upon the ground I lose myself / between the sounds
+        and open wide to suck it in. / I feel it move across my skin. / I'm
+        reaching up and reaching out. / I'm reaching for the random or
+        whatever will bewilder me. / Whatever will bewilder me. / And
+        following our will and wind we may just go where no one's been. /
+        We'll ride the spiral to the end and may just go where no one's
+        been.
+
+        Spiral out. Keep going...
+        """
+        pass
+
+All functions, methods, and classes are to contain docstrings. Object data
+model methods (e.g. ``__repr__``) are typically the exception to this rule.
+
+Thanks for helping to make the world a better place!
+
+.. _PEP 8: https://pep8.org/
+.. _line continuations: https://www.python.org/dev/peps/pep-0008/#indentation
 
 Documentation Contributions
 ---------------------------

docs/index.rst

@@ -9,21 +9,17 @@ Requests: HTTP for Humans™
 Release v\ |version|. (:ref:`Installation <install>`)
 
 
-.. image:: https://pepy.tech/badge/requests/month
+.. image:: https://pepy.tech/badge/requests
     :target: https://pepy.tech/project/requests
-    :alt: Requests Downloads Per Month Badge
     
 .. image:: https://img.shields.io/pypi/l/requests.svg
     :target: https://pypi.org/project/requests/
-    :alt: License Badge
 
 .. image:: https://img.shields.io/pypi/wheel/requests.svg
     :target: https://pypi.org/project/requests/
-    :alt: Wheel Support Badge
 
 .. image:: https://img.shields.io/pypi/pyversions/requests.svg
     :target: https://pypi.org/project/requests/
-    :alt: Python Version Support Badge
 
 **Requests** is an elegant and simple HTTP library for Python, built for human beings.
 
@@ -72,7 +68,7 @@ Requests is ready for today's web.
 - Chunked Requests
 - ``.netrc`` Support
 
-Requests officially supports Python 3.7+, and runs great on PyPy.
+Requests officially supports Python 2.7 & 3.5+, and runs great on PyPy.
 
 
 The User Guide

docs/requirements.txt

@@ -1,3 +0,0 @@
-# Pinning to avoid unexpected breakages.
-# Used by RTD to generate docs.
-Sphinx==4.2.0

docs/user/advanced.rst

@@ -233,7 +233,7 @@ or persistent::
     s.verify = '/path/to/certfile'
 
 .. note:: If ``verify`` is set to a path to a directory, the directory must have been processed using
-  the ``c_rehash`` utility supplied with OpenSSL.
+  the c_rehash utility supplied with OpenSSL.
 
 This list of trusted CAs can also be specified through the ``REQUESTS_CA_BUNDLE`` environment variable.
 If ``REQUESTS_CA_BUNDLE`` is not set, ``CURL_CA_BUNDLE`` will be used as fallback.
@@ -305,7 +305,7 @@ immediately. You can override this behaviour and defer downloading the response
 body until you access the :attr:`Response.content <requests.Response.content>`
 attribute with the ``stream`` parameter::
 
-    tarball_url = 'https://github.com/psf/requests/tarball/main'
+    tarball_url = 'https://github.com/psf/requests/tarball/master'
     r = requests.get(tarball_url, stream=True)
 
 At this point only the response headers have been downloaded and the connection
@@ -446,7 +446,7 @@ argument.
     def print_url(r, *args, **kwargs):
         print(r.url)
 
-Your callback function must handle its own exceptions. Any unhandled exception won't be passed silently and thus should be handled by the code calling Requests.
+If an error occurs while executing your callback, a warning is given.
 
 If the callback function returns a value, it is assumed that it is to
 replace the data that was passed in. If the function doesn't return
@@ -598,30 +598,20 @@ Alternatively you can configure it once for an entire
       'http': 'http://10.10.1.10:3128',
       'https': 'http://10.10.1.10:1080',
     }
-    session = requests.Session()
+    session = request.Session()
     session.proxies.update(proxies)
 
     session.get('http://example.org')
 
-.. warning::  Setting ``session.proxies`` may behave differently than expected.
-    Values provided will be overwritten by environmental proxies
-    (those returned by `urllib.request.getproxies <https://docs.python.org/3/library/urllib.request.html#urllib.request.getproxies>`_).
-    To ensure the use of proxies in the presence of environmental proxies,
-    explicitly specify the ``proxies`` argument on all individual requests as
-    initially explained above.
-
-    See `#2018 <https://github.com/psf/requests/issues/2018>`_ for details.
-
-When the proxies configuration is not overridden per request as shown above,
-Requests relies on the proxy configuration defined by standard
-environment variables ``http_proxy``, ``https_proxy``, ``no_proxy``,
-and ``all_proxy``. Uppercase variants of these variables are also supported.
+When the proxies configuration is not overridden in python as shown above,
+by default Requests relies on the proxy configuration defined by standard
+environment variables ``http_proxy``, ``https_proxy``, ``no_proxy`` and
+``curl_ca_bundle``. Uppercase variants of these variables are also supported.
 You can therefore set them to configure Requests (only set the ones relevant
 to your needs)::
 
     $ export HTTP_PROXY="http://10.10.1.10:3128"
     $ export HTTPS_PROXY="http://10.10.1.10:1080"
-    $ export ALL_PROXY="socks5://10.10.1.10:3434"
 
     $ python
     >>> import requests
@@ -636,7 +626,7 @@ syntax in any of the above configuration entries::
     >>> proxies = {'http': 'http://user:pass@10.10.1.10:3128/'}
 
 .. warning:: Storing sensitive username and password information in an
-   environment variable or a version-controlled file is a security risk and is
+   environment variable or a version-controled file is a security risk and is
    highly discouraged.
 
 To give a proxy for a specific scheme and host, use the
@@ -656,10 +646,10 @@ certificates trusted by Requests can be found with::
     from requests.utils import DEFAULT_CA_BUNDLE_PATH
     print(DEFAULT_CA_BUNDLE_PATH)
 
-You override this default certificate bundle by setting the ``REQUESTS_CA_BUNDLE``
-(or ``CURL_CA_BUNDLE``) environment variable to another file path::
+You override this default certificate bundle by setting the standard
+``curl_ca_bundle`` environment variable to another file path::
 
-    $ export REQUESTS_CA_BUNDLE="/usr/local/myproxy_info/cacert.pem"
+    $ export curl_ca_bundle="/usr/local/myproxy_info/cacert.pem"
     $ export https_proxy="http://10.10.1.10:1080"
 
     $ python
@@ -707,21 +697,10 @@ Encodings
 When you receive a response, Requests makes a guess at the encoding to
 use for decoding the response when you access the :attr:`Response.text
 <requests.Response.text>` attribute. Requests will first check for an
-encoding in the HTTP header, and if none is present, will use
-`charset_normalizer <https://pypi.org/project/charset_normalizer/>`_
-or `chardet <https://github.com/chardet/chardet>`_ to attempt to
-guess the encoding.
+encoding in the HTTP header, and if none is present, will use `chardet
+<https://pypi.org/project/chardet/>`_ to attempt to guess the encoding.
 
-If ``chardet`` is installed, ``requests`` uses it, however for python3
-``chardet`` is no longer a mandatory dependency. The ``chardet``
-library is an LGPL-licenced dependency and some users of requests
-cannot depend on mandatory LGPL-licensed dependencies.
-
-When you install ``requests`` without specifying ``[use_chardet_on_py3]`` extra,
-and ``chardet`` is not already installed, ``requests`` uses ``charset-normalizer``
-(MIT-licensed) to guess the encoding.
-
-The only time Requests will not guess the encoding is if no explicit charset
+The only time Requests will not do this is if no explicit charset
 is present in the HTTP headers **and** the ``Content-Type``
 header contains ``text``. In this situation, `RFC 2616
 <https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1>`_ specifies
@@ -1026,8 +1005,8 @@ library to use SSLv3::
                 num_pools=connections, maxsize=maxsize,
                 block=block, ssl_version=ssl.PROTOCOL_SSLv3)
 
-.. _`described here`: https://kenreitz.org/essays/2012/06/14/the-future-of-python-http
-.. _`urllib3`: https://github.com/urllib3/urllib3
+.. _`described here`: https://www.kennethreitz.org/essays/the-future-of-python-http
+.. _`urllib3`: https://github.com/shazow/urllib3
 
 .. _blocking-or-nonblocking:
 
@@ -1046,7 +1025,7 @@ out there that combine Requests with one of Python's asynchronicity frameworks.
 Some excellent examples are `requests-threads`_, `grequests`_, `requests-futures`_, and `httpx`_.
 
 .. _`requests-threads`: https://github.com/requests/requests-threads
-.. _`grequests`: https://github.com/spyoungtech/grequests
+.. _`grequests`: https://github.com/kennethreitz/grequests
 .. _`requests-futures`: https://github.com/ross/requests-futures
 .. _`httpx`: https://github.com/encode/httpx
 

docs/user/authentication.rst

@@ -19,14 +19,13 @@ the simplest kind, and Requests supports it straight out of the box.
 Making requests with HTTP Basic Auth is very simple::
 
     >>> from requests.auth import HTTPBasicAuth
-    >>> basic = HTTPBasicAuth('user', 'pass')
-    >>> requests.get('https://httpbin.org/basic-auth/user/pass', auth=basic)
+    >>> requests.get('https://api.github.com/user', auth=HTTPBasicAuth('user', 'pass'))
     <Response [200]>
 
 In fact, HTTP Basic Auth is so common that Requests provides a handy shorthand
 for using it::
 
-    >>> requests.get('https://httpbin.org/basic-auth/user/pass', auth=('user', 'pass'))
+    >>> requests.get('https://api.github.com/user', auth=('user', 'pass'))
     <Response [200]>
 
 Providing the credentials in a tuple like this is exactly the same as the

docs/user/install.rst

@@ -22,11 +22,11 @@ Requests is actively developed on GitHub, where the code is
 
 You can either clone the public repository::
 
-    $ git clone https://github.com/psf/requests.git
+    $ git clone git://github.com/psf/requests.git
 
-Or, download the `tarball <https://github.com/psf/requests/tarball/main>`_::
+Or, download the `tarball <https://github.com/psf/requests/tarball/master>`_::
 
-    $ curl -OL https://github.com/psf/requests/tarball/main
+    $ curl -OL https://github.com/psf/requests/tarball/master
     # optionally, zipball is also available (for Windows users).
 
 Once you have a copy of the source, you can embed it in your own Python

docs/user/quickstart.rst

@@ -37,12 +37,12 @@ get all the information we need from this object.
 Requests' simple API means that all forms of HTTP request are as obvious. For
 example, this is how you make an HTTP POST request::
 
-    >>> r = requests.post('https://httpbin.org/post', data={'key': 'value'})
+    >>> r = requests.post('https://httpbin.org/post', data = {'key':'value'})
 
 Nice, right? What about the other HTTP request types: PUT, DELETE, HEAD and
 OPTIONS? These are all just as simple::
 
-    >>> r = requests.put('https://httpbin.org/put', data={'key': 'value'})
+    >>> r = requests.put('https://httpbin.org/put', data = {'key':'value'})
     >>> r = requests.delete('https://httpbin.org/delete')
     >>> r = requests.head('https://httpbin.org/get')
     >>> r = requests.options('https://httpbin.org/get')
@@ -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/brotlicffi>`_ is installed.
-
 For example, to create an image from binary data returned by a request, you can
 use the following code::
 
@@ -153,9 +150,7 @@ There's also a builtin JSON decoder, in case you're dealing with JSON data::
 
 In case the JSON decoding fails, ``r.json()`` raises an exception. For example, if
 the response gets a 204 (No Content), or if the response contains invalid JSON,
-attempting ``r.json()`` raises ``requests.exceptions.JSONDecodeError``. This wrapper exception
-provides interoperability for multiple exceptions that may be thrown by different
-python versions and json serialization libraries.
+attempting ``r.json()`` raises ``ValueError: No JSON object could be decoded``.
 
 It should be noted that the success of the call to ``r.json()`` does **not**
 indicate the success of the response. Some servers may return a JSON object in a
@@ -283,12 +278,8 @@ For example, the GitHub API v3 accepts JSON-Encoded POST/PATCH data::
 
     >>> r = requests.post(url, data=json.dumps(payload))
 
-Please note that the above code will NOT add the ``Content-Type`` header
-(so in particular it will NOT set it to ``application/json``).
-
-If you need that header set and you don't want to encode the ``dict`` yourself,
-you can also pass it directly using the ``json`` parameter (added in version 2.4.2)
-and it will be encoded automatically:
+Instead of encoding the ``dict`` yourself, you can also pass it directly using
+the ``json`` parameter (added in version 2.4.2) and it will be encoded automatically::
 
     >>> url = 'https://api.github.com/some/endpoint'
     >>> payload = {'some': 'data'}
@@ -297,6 +288,8 @@ and it will be encoded automatically:
 
 Note, the ``json`` parameter is ignored if either ``data`` or ``files`` is passed.
 
+Using the ``json`` parameter in the request will change the ``Content-Type`` in the header to ``application/json``.
+
 POST a Multipart-Encoded File
 -----------------------------
 

pyproject.toml

@@ -1,13 +0,0 @@
-[tool.isort]
-profile = "black"
-src_paths = ["requests", "test"]
-honor_noqa = true
-
-[tool.pytest.ini_options]
-addopts = "-p no:warnings --doctest-modules"
-doctest_optionflags = "NORMALIZE_WHITESPACE ELLIPSIS"
-minversion = "6.2"
-testpaths = [
-    "requests",
-    "tests",
-]

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+addopts = -p no:warnings --doctest-modules
+doctest_optionflags= NORMALIZE_WHITESPACE ELLIPSIS

requests/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 #   __
 #  /__)  _  _     _   _ _/   _
 # / (   (- (/ (/ (- _)  /  _)
@@ -38,30 +40,19 @@ is at <https://requests.readthedocs.io>.
 :license: Apache 2.0, see LICENSE for more details.
 """
 
-import warnings
-
 import urllib3
-
+import chardet
+import warnings
 from .exceptions import RequestsDependencyWarning
 
-try:
-    from charset_normalizer import __version__ as charset_normalizer_version
-except ImportError:
-    charset_normalizer_version = None
 
-try:
-    from chardet import __version__ as chardet_version
-except ImportError:
-    chardet_version = None
-
-
-def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
-    urllib3_version = urllib3_version.split(".")
-    assert urllib3_version != ["dev"]  # Verify urllib3 isn't installed from git.
+def check_compatibility(urllib3_version, chardet_version):
+    urllib3_version = urllib3_version.split('.')
+    assert urllib3_version != ['dev']  # Verify urllib3 isn't installed from git.
 
     # Sometimes, urllib3 only reports its version as 16.1.
     if len(urllib3_version) == 2:
-        urllib3_version.append("0")
+        urllib3_version.append('0')
 
     # Check urllib3 for compatibility.
     major, minor, patch = urllib3_version  # noqa: F811
@@ -71,48 +62,33 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
     assert minor >= 21
     assert minor <= 26
 
-    # Check charset_normalizer for compatibility.
-    if chardet_version:
-        major, minor, patch = chardet_version.split(".")[:3]
-        major, minor, patch = int(major), int(minor), int(patch)
-        # chardet_version >= 3.0.2, < 6.0.0
-        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
-    elif charset_normalizer_version:
-        major, minor, patch = charset_normalizer_version.split(".")[:3]
-        major, minor, patch = int(major), int(minor), int(patch)
-        # charset_normalizer >= 2.0.0 < 4.0.0
-        assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
-    else:
-        raise Exception("You need either charset_normalizer or chardet installed")
+    # Check chardet for compatibility.
+    major, minor, patch = chardet_version.split('.')[:3]
+    major, minor, patch = int(major), int(minor), int(patch)
+    # chardet >= 3.0.2, < 3.1.0
+    assert major == 3
+    assert minor < 1
+    assert patch >= 2
 
 
 def _check_cryptography(cryptography_version):
     # cryptography < 1.3.4
     try:
-        cryptography_version = list(map(int, cryptography_version.split(".")))
+        cryptography_version = list(map(int, cryptography_version.split('.')))
     except ValueError:
         return
 
     if cryptography_version < [1, 3, 4]:
-        warning = "Old version of cryptography ({}) may cause slowdown.".format(
-            cryptography_version
-        )
+        warning = 'Old version of cryptography ({}) may cause slowdown.'.format(cryptography_version)
         warnings.warn(warning, RequestsDependencyWarning)
 
-
 # Check imported dependencies for compatibility.
 try:
-    check_compatibility(
-        urllib3.__version__, chardet_version, charset_normalizer_version
-    )
+    check_compatibility(urllib3.__version__, chardet.__version__)
 except (AssertionError, ValueError):
-    warnings.warn(
-        "urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn't match a supported "
-        "version!".format(
-            urllib3.__version__, chardet_version, charset_normalizer_version
-        ),
-        RequestsDependencyWarning,
-    )
+    warnings.warn("urllib3 ({}) or chardet ({}) doesn't match a supported "
+                  "version!".format(urllib3.__version__, chardet.__version__),
+                  RequestsDependencyWarning)
 
 # Attempt to enable urllib3's fallback for SNI support
 # if the standard library doesn't support SNI or the
@@ -125,56 +101,39 @@ try:
 
     if not getattr(ssl, "HAS_SNI", False):
         from urllib3.contrib import pyopenssl
-
         pyopenssl.inject_into_urllib3()
 
         # Check cryptography version
         from cryptography import __version__ as cryptography_version
-
         _check_cryptography(cryptography_version)
 except ImportError:
     pass
 
 # urllib3's DependencyWarnings should be silenced.
 from urllib3.exceptions import DependencyWarning
+warnings.simplefilter('ignore', DependencyWarning)
 
-warnings.simplefilter("ignore", DependencyWarning)
+from .__version__ import __title__, __description__, __url__, __version__
+from .__version__ import __build__, __author__, __author_email__, __license__
+from .__version__ import __copyright__, __cake__
+
+from . import utils
+from . import packages
+from .models import Request, Response, PreparedRequest
+from .api import request, get, head, post, patch, put, delete, options
+from .sessions import session, Session
+from .status_codes import codes
+from .exceptions import (
+    RequestException, Timeout, URLRequired,
+    TooManyRedirects, HTTPError, ConnectionError,
+    FileModeWarning, ConnectTimeout, ReadTimeout
+)
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
 from logging import NullHandler
 
-from . import packages, utils
-from .__version__ import (
-    __author__,
-    __author_email__,
-    __build__,
-    __cake__,
-    __copyright__,
-    __description__,
-    __license__,
-    __title__,
-    __url__,
-    __version__,
-)
-from .api import delete, get, head, options, patch, post, put, request
-from .exceptions import (
-    ConnectionError,
-    ConnectTimeout,
-    FileModeWarning,
-    HTTPError,
-    JSONDecodeError,
-    ReadTimeout,
-    RequestException,
-    Timeout,
-    TooManyRedirects,
-    URLRequired,
-)
-from .models import PreparedRequest, Request, Response
-from .sessions import Session, session
-from .status_codes import codes
-
 logging.getLogger(__name__).addHandler(NullHandler())
 
 # FileModeWarnings go off per the default.
-warnings.simplefilter("default", FileModeWarning, append=True)
+warnings.simplefilter('default', FileModeWarning, append=True)

requests/__version__.py

@@ -2,13 +2,13 @@
 # |(  |-  |.| | | |-  `-.  |  `-.
 # ' ' `-' `-`.`-' `-' `-'  '  `-'
 
-__title__ = "requests"
-__description__ = "Python HTTP for Humans."
-__url__ = "https://requests.readthedocs.io"
-__version__ = "2.28.2"
-__build__ = 0x022802
-__author__ = "Kenneth Reitz"
-__author_email__ = "me@kennethreitz.org"
-__license__ = "Apache 2.0"
-__copyright__ = "Copyright Kenneth Reitz"
-__cake__ = "\u2728 \U0001f370 \u2728"
+__title__ = 'requests'
+__description__ = 'Python HTTP for Humans.'
+__url__ = 'https://requests.readthedocs.io'
+__version__ = '2.25.0'
+__build__ = 0x022500
+__author__ = 'Kenneth Reitz'
+__author_email__ = 'me@kennethreitz.org'
+__license__ = 'Apache 2.0'
+__copyright__ = 'Copyright 2020 Kenneth Reitz'
+__cake__ = u'\u2728 \U0001f370 \u2728'

requests/_internal_utils.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests._internal_utils
 ~~~~~~~~~~~~~~
@@ -5,22 +7,11 @@ requests._internal_utils
 Provides utility functions that are consumed internally by Requests
 which depend on extremely few external helpers (such as compat)
 """
-import re
 
-from .compat import builtin_str
-
-_VALID_HEADER_NAME_RE_BYTE = re.compile(rb"^[^:\s][^:\r\n]*$")
-_VALID_HEADER_NAME_RE_STR = re.compile(r"^[^:\s][^:\r\n]*$")
-_VALID_HEADER_VALUE_RE_BYTE = re.compile(rb"^\S[^\r\n]*$|^$")
-_VALID_HEADER_VALUE_RE_STR = re.compile(r"^\S[^\r\n]*$|^$")
-
-HEADER_VALIDATORS = {
-    bytes: (_VALID_HEADER_NAME_RE_BYTE, _VALID_HEADER_VALUE_RE_BYTE),
-    str: (_VALID_HEADER_NAME_RE_STR, _VALID_HEADER_VALUE_RE_STR),
-}
+from .compat import is_py2, builtin_str, str
 
 
-def to_native_string(string, encoding="ascii"):
+def to_native_string(string, encoding='ascii'):
     """Given a string object, regardless of type, returns a representation of
     that string in the native string type, encoding and decoding where
     necessary. This assumes ASCII unless told otherwise.
@@ -28,7 +19,10 @@ def to_native_string(string, encoding="ascii"):
     if isinstance(string, builtin_str):
         out = string
     else:
-        out = string.decode(encoding)
+        if is_py2:
+            out = string.encode(encoding)
+        else:
+            out = string.decode(encoding)
 
     return out
 
@@ -42,7 +36,7 @@ def unicode_is_ascii(u_string):
     """
     assert isinstance(u_string, str)
     try:
-        u_string.encode("ascii")
+        u_string.encode('ascii')
         return True
     except UnicodeEncodeError:
         return False

requests/adapters.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.adapters
 ~~~~~~~~~~~~~~~~~
@@ -7,76 +9,57 @@ and maintain connections.
 """
 
 import os.path
-import socket  # noqa: F401
+import socket
 
-from urllib3.exceptions import ClosedPoolError, ConnectTimeoutError
-from urllib3.exceptions import HTTPError as _HTTPError
-from urllib3.exceptions import InvalidHeader as _InvalidHeader
-from urllib3.exceptions import (
-    LocationValueError,
-    MaxRetryError,
-    NewConnectionError,
-    ProtocolError,
-)
-from urllib3.exceptions import ProxyError as _ProxyError
-from urllib3.exceptions import ReadTimeoutError, ResponseError
-from urllib3.exceptions import SSLError as _SSLError
 from urllib3.poolmanager import PoolManager, proxy_from_url
 from urllib3.response import HTTPResponse
-from urllib3.util import Timeout as TimeoutSauce
 from urllib3.util import parse_url
+from urllib3.util import Timeout as TimeoutSauce
 from urllib3.util.retry import Retry
+from urllib3.exceptions import ClosedPoolError
+from urllib3.exceptions import ConnectTimeoutError
+from urllib3.exceptions import HTTPError as _HTTPError
+from urllib3.exceptions import MaxRetryError
+from urllib3.exceptions import NewConnectionError
+from urllib3.exceptions import ProxyError as _ProxyError
+from urllib3.exceptions import ProtocolError
+from urllib3.exceptions import ReadTimeoutError
+from urllib3.exceptions import SSLError as _SSLError
+from urllib3.exceptions import ResponseError
+from urllib3.exceptions import LocationValueError
 
-from .auth import _basic_auth_str
-from .compat import basestring, urlparse
-from .cookies import extract_cookies_to_jar
-from .exceptions import (
-    ConnectionError,
-    ConnectTimeout,
-    InvalidHeader,
-    InvalidProxyURL,
-    InvalidSchema,
-    InvalidURL,
-    ProxyError,
-    ReadTimeout,
-    RetryError,
-    SSLError,
-)
 from .models import Response
+from .compat import urlparse, basestring
+from .utils import (DEFAULT_CA_BUNDLE_PATH, extract_zipped_paths,
+                    get_encoding_from_headers, prepend_scheme_if_needed,
+                    get_auth_from_url, urldefragauth, select_proxy)
 from .structures import CaseInsensitiveDict
-from .utils import (
-    DEFAULT_CA_BUNDLE_PATH,
-    extract_zipped_paths,
-    get_auth_from_url,
-    get_encoding_from_headers,
-    prepend_scheme_if_needed,
-    select_proxy,
-    urldefragauth,
-)
+from .cookies import extract_cookies_to_jar
+from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
+                         ProxyError, RetryError, InvalidSchema, InvalidProxyURL,
+                         InvalidURL)
+from .auth import _basic_auth_str
 
 try:
     from urllib3.contrib.socks import SOCKSProxyManager
 except ImportError:
-
     def SOCKSProxyManager(*args, **kwargs):
         raise InvalidSchema("Missing dependencies for SOCKS support.")
 
-
 DEFAULT_POOLBLOCK = False
 DEFAULT_POOLSIZE = 10
 DEFAULT_RETRIES = 0
 DEFAULT_POOL_TIMEOUT = None
 
 
-class BaseAdapter:
+class BaseAdapter(object):
     """The Base Transport Adapter"""
 
     def __init__(self):
-        super().__init__()
+        super(BaseAdapter, self).__init__()
 
-    def send(
-        self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None
-    ):
+    def send(self, request, stream=False, timeout=None, verify=True,
+             cert=None, proxies=None):
         """Sends PreparedRequest object. Returns Response object.
 
         :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
@@ -124,22 +107,12 @@ class HTTPAdapter(BaseAdapter):
       >>> a = requests.adapters.HTTPAdapter(max_retries=3)
       >>> s.mount('http://', a)
     """
+    __attrs__ = ['max_retries', 'config', '_pool_connections', '_pool_maxsize',
+                 '_pool_block']
 
-    __attrs__ = [
-        "max_retries",
-        "config",
-        "_pool_connections",
-        "_pool_maxsize",
-        "_pool_block",
-    ]
-
-    def __init__(
-        self,
-        pool_connections=DEFAULT_POOLSIZE,
-        pool_maxsize=DEFAULT_POOLSIZE,
-        max_retries=DEFAULT_RETRIES,
-        pool_block=DEFAULT_POOLBLOCK,
-    ):
+    def __init__(self, pool_connections=DEFAULT_POOLSIZE,
+                 pool_maxsize=DEFAULT_POOLSIZE, max_retries=DEFAULT_RETRIES,
+                 pool_block=DEFAULT_POOLBLOCK):
         if max_retries == DEFAULT_RETRIES:
             self.max_retries = Retry(0, read=False)
         else:
@@ -147,7 +120,7 @@ class HTTPAdapter(BaseAdapter):
         self.config = {}
         self.proxy_manager = {}
 
-        super().__init__()
+        super(HTTPAdapter, self).__init__()
 
         self._pool_connections = pool_connections
         self._pool_maxsize = pool_maxsize
@@ -167,13 +140,10 @@ class HTTPAdapter(BaseAdapter):
         for attr, value in state.items():
             setattr(self, attr, value)
 
-        self.init_poolmanager(
-            self._pool_connections, self._pool_maxsize, block=self._pool_block
-        )
+        self.init_poolmanager(self._pool_connections, self._pool_maxsize,
+                              block=self._pool_block)
 
-    def init_poolmanager(
-        self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs
-    ):
+    def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs):
         """Initializes a urllib3 PoolManager.
 
         This method should not be called from user code, and is only
@@ -190,13 +160,8 @@ class HTTPAdapter(BaseAdapter):
         self._pool_maxsize = maxsize
         self._pool_block = block
 
-        self.poolmanager = PoolManager(
-            num_pools=connections,
-            maxsize=maxsize,
-            block=block,
-            strict=True,
-            **pool_kwargs,
-        )
+        self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize,
+                                       block=block, strict=True, **pool_kwargs)
 
     def proxy_manager_for(self, proxy, **proxy_kwargs):
         """Return urllib3 ProxyManager for the given proxy.
@@ -212,7 +177,7 @@ class HTTPAdapter(BaseAdapter):
         """
         if proxy in self.proxy_manager:
             manager = self.proxy_manager[proxy]
-        elif proxy.lower().startswith("socks"):
+        elif proxy.lower().startswith('socks'):
             username, password = get_auth_from_url(proxy)
             manager = self.proxy_manager[proxy] = SOCKSProxyManager(
                 proxy,
@@ -221,7 +186,7 @@ class HTTPAdapter(BaseAdapter):
                 num_pools=self._pool_connections,
                 maxsize=self._pool_maxsize,
                 block=self._pool_block,
-                **proxy_kwargs,
+                **proxy_kwargs
             )
         else:
             proxy_headers = self.proxy_headers(proxy)
@@ -231,8 +196,7 @@ class HTTPAdapter(BaseAdapter):
                 num_pools=self._pool_connections,
                 maxsize=self._pool_maxsize,
                 block=self._pool_block,
-                **proxy_kwargs,
-            )
+                **proxy_kwargs)
 
         return manager
 
@@ -248,7 +212,7 @@ class HTTPAdapter(BaseAdapter):
             to a CA bundle to use
         :param cert: The SSL certificate to verify.
         """
-        if url.lower().startswith("https") and verify:
+        if url.lower().startswith('https') and verify:
 
             cert_loc = None
 
@@ -260,19 +224,17 @@ class HTTPAdapter(BaseAdapter):
                 cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
 
             if not cert_loc or not os.path.exists(cert_loc):
-                raise OSError(
-                    f"Could not find a suitable TLS CA certificate bundle, "
-                    f"invalid path: {cert_loc}"
-                )
+                raise IOError("Could not find a suitable TLS CA certificate bundle, "
+                              "invalid path: {}".format(cert_loc))
 
-            conn.cert_reqs = "CERT_REQUIRED"
+            conn.cert_reqs = 'CERT_REQUIRED'
 
             if not os.path.isdir(cert_loc):
                 conn.ca_certs = cert_loc
             else:
                 conn.ca_cert_dir = cert_loc
         else:
-            conn.cert_reqs = "CERT_NONE"
+            conn.cert_reqs = 'CERT_NONE'
             conn.ca_certs = None
             conn.ca_cert_dir = None
 
@@ -284,14 +246,11 @@ class HTTPAdapter(BaseAdapter):
                 conn.cert_file = cert
                 conn.key_file = None
             if conn.cert_file and not os.path.exists(conn.cert_file):
-                raise OSError(
-                    f"Could not find the TLS certificate file, "
-                    f"invalid path: {conn.cert_file}"
-                )
+                raise IOError("Could not find the TLS certificate file, "
+                              "invalid path: {}".format(conn.cert_file))
             if conn.key_file and not os.path.exists(conn.key_file):
-                raise OSError(
-                    f"Could not find the TLS key file, invalid path: {conn.key_file}"
-                )
+                raise IOError("Could not find the TLS key file, "
+                              "invalid path: {}".format(conn.key_file))
 
     def build_response(self, req, resp):
         """Builds a :class:`Response <requests.Response>` object from a urllib3
@@ -306,10 +265,10 @@ class HTTPAdapter(BaseAdapter):
         response = Response()
 
         # Fallback to None if there's no status_code, for whatever reason.
-        response.status_code = getattr(resp, "status", None)
+        response.status_code = getattr(resp, 'status', None)
 
         # Make headers case-insensitive.
-        response.headers = CaseInsensitiveDict(getattr(resp, "headers", {}))
+        response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
 
         # Set encoding.
         response.encoding = get_encoding_from_headers(response.headers)
@@ -317,7 +276,7 @@ class HTTPAdapter(BaseAdapter):
         response.reason = response.raw.reason
 
         if isinstance(req.url, bytes):
-            response.url = req.url.decode("utf-8")
+            response.url = req.url.decode('utf-8')
         else:
             response.url = req.url
 
@@ -342,13 +301,11 @@ class HTTPAdapter(BaseAdapter):
         proxy = select_proxy(url, proxies)
 
         if proxy:
-            proxy = prepend_scheme_if_needed(proxy, "http")
+            proxy = prepend_scheme_if_needed(proxy, 'http')
             proxy_url = parse_url(proxy)
             if not proxy_url.host:
-                raise InvalidProxyURL(
-                    "Please check proxy URL. It is malformed "
-                    "and could be missing the host."
-                )
+                raise InvalidProxyURL("Please check proxy URL. It is malformed"
+                                      " and could be missing the host.")
             proxy_manager = self.proxy_manager_for(proxy)
             conn = proxy_manager.connection_from_url(url)
         else:
@@ -386,11 +343,11 @@ class HTTPAdapter(BaseAdapter):
         proxy = select_proxy(request.url, proxies)
         scheme = urlparse(request.url).scheme
 
-        is_proxied_http_request = proxy and scheme != "https"
+        is_proxied_http_request = (proxy and scheme != 'https')
         using_socks_proxy = False
         if proxy:
             proxy_scheme = urlparse(proxy).scheme.lower()
-            using_socks_proxy = proxy_scheme.startswith("socks")
+            using_socks_proxy = proxy_scheme.startswith('socks')
 
         url = request.path_url
         if is_proxied_http_request and not using_socks_proxy:
@@ -429,13 +386,12 @@ class HTTPAdapter(BaseAdapter):
         username, password = get_auth_from_url(proxy)
 
         if username:
-            headers["Proxy-Authorization"] = _basic_auth_str(username, password)
+            headers['Proxy-Authorization'] = _basic_auth_str(username,
+                                                             password)
 
         return headers
 
-    def send(
-        self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None
-    ):
+    def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None):
         """Sends PreparedRequest object. Returns Response object.
 
         :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
@@ -459,26 +415,20 @@ class HTTPAdapter(BaseAdapter):
 
         self.cert_verify(conn, request.url, verify, cert)
         url = self.request_url(request, proxies)
-        self.add_headers(
-            request,
-            stream=stream,
-            timeout=timeout,
-            verify=verify,
-            cert=cert,
-            proxies=proxies,
-        )
+        self.add_headers(request, stream=stream, timeout=timeout, verify=verify, cert=cert, proxies=proxies)
 
-        chunked = not (request.body is None or "Content-Length" in request.headers)
+        chunked = not (request.body is None or 'Content-Length' in request.headers)
 
         if isinstance(timeout, tuple):
             try:
                 connect, read = timeout
                 timeout = TimeoutSauce(connect=connect, read=read)
-            except ValueError:
-                raise ValueError(
-                    f"Invalid timeout {timeout}. Pass a (connect, read) timeout tuple, "
-                    f"or a single float to set both timeouts to the same value."
-                )
+            except ValueError as e:
+                # this may raise a string formatting error.
+                err = ("Invalid timeout {}. Pass a (connect, read) "
+                       "timeout tuple, or a single float to set "
+                       "both timeouts to the same value".format(timeout))
+                raise ValueError(err)
         elif isinstance(timeout, TimeoutSauce):
             pass
         else:
@@ -496,24 +446,20 @@ class HTTPAdapter(BaseAdapter):
                     preload_content=False,
                     decode_content=False,
                     retries=self.max_retries,
-                    timeout=timeout,
+                    timeout=timeout
                 )
 
             # Send the request.
             else:
-                if hasattr(conn, "proxy_pool"):
+                if hasattr(conn, 'proxy_pool'):
                     conn = conn.proxy_pool
 
                 low_conn = conn._get_conn(timeout=DEFAULT_POOL_TIMEOUT)
 
                 try:
-                    skip_host = "Host" in request.headers
-                    low_conn.putrequest(
-                        request.method,
-                        url,
-                        skip_accept_encoding=True,
-                        skip_host=skip_host,
-                    )
+                    low_conn.putrequest(request.method,
+                                        url,
+                                        skip_accept_encoding=True)
 
                     for header, value in request.headers.items():
                         low_conn.putheader(header, value)
@@ -521,29 +467,34 @@ class HTTPAdapter(BaseAdapter):
                     low_conn.endheaders()
 
                     for i in request.body:
-                        low_conn.send(hex(len(i))[2:].encode("utf-8"))
-                        low_conn.send(b"\r\n")
+                        low_conn.send(hex(len(i))[2:].encode('utf-8'))
+                        low_conn.send(b'\r\n')
                         low_conn.send(i)
-                        low_conn.send(b"\r\n")
-                    low_conn.send(b"0\r\n\r\n")
+                        low_conn.send(b'\r\n')
+                    low_conn.send(b'0\r\n\r\n')
 
                     # Receive the response from the server
-                    r = low_conn.getresponse()
+                    try:
+                        # For Python 2.7, use buffering of HTTP responses
+                        r = low_conn.getresponse(buffering=True)
+                    except TypeError:
+                        # For compatibility with Python 3.3+
+                        r = low_conn.getresponse()
 
                     resp = HTTPResponse.from_httplib(
                         r,
                         pool=conn,
                         connection=low_conn,
                         preload_content=False,
-                        decode_content=False,
+                        decode_content=False
                     )
-                except Exception:
+                except:
                     # If we hit any problems here, clean up the connection.
-                    # Then, raise so that we can handle the actual exception.
+                    # Then, reraise so that we can handle the actual exception.
                     low_conn.close()
                     raise
 
-        except (ProtocolError, OSError) as err:
+        except (ProtocolError, socket.error) as err:
             raise ConnectionError(err, request=request)
 
         except MaxRetryError as e:
@@ -576,8 +527,6 @@ class HTTPAdapter(BaseAdapter):
                 raise SSLError(e, request=request)
             elif isinstance(e, ReadTimeoutError):
                 raise ReadTimeout(e, request=request)
-            elif isinstance(e, _InvalidHeader):
-                raise InvalidHeader(e, request=request)
             else:
                 raise
 

requests/api.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.api
 ~~~~~~~~~~~~
@@ -70,7 +72,8 @@ def get(url, params=None, **kwargs):
     :rtype: requests.Response
     """
 
-    return request("get", url, params=params, **kwargs)
+    kwargs.setdefault('allow_redirects', True)
+    return request('get', url, params=params, **kwargs)
 
 
 def options(url, **kwargs):
@@ -82,7 +85,8 @@ def options(url, **kwargs):
     :rtype: requests.Response
     """
 
-    return request("options", url, **kwargs)
+    kwargs.setdefault('allow_redirects', True)
+    return request('options', url, **kwargs)
 
 
 def head(url, **kwargs):
@@ -96,8 +100,8 @@ def head(url, **kwargs):
     :rtype: requests.Response
     """
 
-    kwargs.setdefault("allow_redirects", False)
-    return request("head", url, **kwargs)
+    kwargs.setdefault('allow_redirects', False)
+    return request('head', url, **kwargs)
 
 
 def post(url, data=None, json=None, **kwargs):
@@ -112,7 +116,7 @@ def post(url, data=None, json=None, **kwargs):
     :rtype: requests.Response
     """
 
-    return request("post", url, data=data, json=json, **kwargs)
+    return request('post', url, data=data, json=json, **kwargs)
 
 
 def put(url, data=None, **kwargs):
@@ -127,7 +131,7 @@ def put(url, data=None, **kwargs):
     :rtype: requests.Response
     """
 
-    return request("put", url, data=data, **kwargs)
+    return request('put', url, data=data, **kwargs)
 
 
 def patch(url, data=None, **kwargs):
@@ -142,7 +146,7 @@ def patch(url, data=None, **kwargs):
     :rtype: requests.Response
     """
 
-    return request("patch", url, data=data, **kwargs)
+    return request('patch', url, data=data, **kwargs)
 
 
 def delete(url, **kwargs):
@@ -154,4 +158,4 @@ def delete(url, **kwargs):
     :rtype: requests.Response
     """
 
-    return request("delete", url, **kwargs)
+    return request('delete', url, **kwargs)

requests/auth.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.auth
 ~~~~~~~~~~~~~
@@ -5,21 +7,22 @@ requests.auth
 This module contains the authentication handlers for Requests.
 """
 
-import hashlib
 import os
 import re
-import threading
 import time
+import hashlib
+import threading
 import warnings
+
 from base64 import b64encode
 
-from ._internal_utils import to_native_string
-from .compat import basestring, str, urlparse
+from .compat import urlparse, str, basestring
 from .cookies import extract_cookies_to_jar
+from ._internal_utils import to_native_string
 from .utils import parse_dict_header
 
-CONTENT_TYPE_FORM_URLENCODED = "application/x-www-form-urlencoded"
-CONTENT_TYPE_MULTI_PART = "multipart/form-data"
+CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
+CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
 
 
 def _basic_auth_str(username, password):
@@ -54,23 +57,23 @@ def _basic_auth_str(username, password):
     # -- End Removal --
 
     if isinstance(username, str):
-        username = username.encode("latin1")
+        username = username.encode('latin1')
 
     if isinstance(password, str):
-        password = password.encode("latin1")
+        password = password.encode('latin1')
 
-    authstr = "Basic " + to_native_string(
-        b64encode(b":".join((username, password))).strip()
+    authstr = 'Basic ' + to_native_string(
+        b64encode(b':'.join((username, password))).strip()
     )
 
     return authstr
 
 
-class AuthBase:
+class AuthBase(object):
     """Base class that all auth implementations derive from"""
 
     def __call__(self, r):
-        raise NotImplementedError("Auth hooks must be callable.")
+        raise NotImplementedError('Auth hooks must be callable.')
 
 
 class HTTPBasicAuth(AuthBase):
@@ -81,18 +84,16 @@ class HTTPBasicAuth(AuthBase):
         self.password = password
 
     def __eq__(self, other):
-        return all(
-            [
-                self.username == getattr(other, "username", None),
-                self.password == getattr(other, "password", None),
-            ]
-        )
+        return all([
+            self.username == getattr(other, 'username', None),
+            self.password == getattr(other, 'password', None)
+        ])
 
     def __ne__(self, other):
         return not self == other
 
     def __call__(self, r):
-        r.headers["Authorization"] = _basic_auth_str(self.username, self.password)
+        r.headers['Authorization'] = _basic_auth_str(self.username, self.password)
         return r
 
 
@@ -100,7 +101,7 @@ class HTTPProxyAuth(HTTPBasicAuth):
     """Attaches HTTP Proxy Authentication to a given Request object."""
 
     def __call__(self, r):
-        r.headers["Proxy-Authorization"] = _basic_auth_str(self.username, self.password)
+        r.headers['Proxy-Authorization'] = _basic_auth_str(self.username, self.password)
         return r
 
 
@@ -115,9 +116,9 @@ class HTTPDigestAuth(AuthBase):
 
     def init_per_thread_state(self):
         # Ensure state is initialized just once per-thread
-        if not hasattr(self._thread_local, "init"):
+        if not hasattr(self._thread_local, 'init'):
             self._thread_local.init = True
-            self._thread_local.last_nonce = ""
+            self._thread_local.last_nonce = ''
             self._thread_local.nonce_count = 0
             self._thread_local.chal = {}
             self._thread_local.pos = None
@@ -128,52 +129,44 @@ class HTTPDigestAuth(AuthBase):
         :rtype: str
         """
 
-        realm = self._thread_local.chal["realm"]
-        nonce = self._thread_local.chal["nonce"]
-        qop = self._thread_local.chal.get("qop")
-        algorithm = self._thread_local.chal.get("algorithm")
-        opaque = self._thread_local.chal.get("opaque")
+        realm = self._thread_local.chal['realm']
+        nonce = self._thread_local.chal['nonce']
+        qop = self._thread_local.chal.get('qop')
+        algorithm = self._thread_local.chal.get('algorithm')
+        opaque = self._thread_local.chal.get('opaque')
         hash_utf8 = None
 
         if algorithm is None:
-            _algorithm = "MD5"
+            _algorithm = 'MD5'
         else:
             _algorithm = algorithm.upper()
         # lambdas assume digest modules are imported at the top level
-        if _algorithm == "MD5" or _algorithm == "MD5-SESS":
-
+        if _algorithm == 'MD5' or _algorithm == 'MD5-SESS':
             def md5_utf8(x):
                 if isinstance(x, str):
-                    x = x.encode("utf-8")
+                    x = x.encode('utf-8')
                 return hashlib.md5(x).hexdigest()
-
             hash_utf8 = md5_utf8
-        elif _algorithm == "SHA":
-
+        elif _algorithm == 'SHA':
             def sha_utf8(x):
                 if isinstance(x, str):
-                    x = x.encode("utf-8")
+                    x = x.encode('utf-8')
                 return hashlib.sha1(x).hexdigest()
-
             hash_utf8 = sha_utf8
-        elif _algorithm == "SHA-256":
-
+        elif _algorithm == 'SHA-256':
             def sha256_utf8(x):
                 if isinstance(x, str):
-                    x = x.encode("utf-8")
+                    x = x.encode('utf-8')
                 return hashlib.sha256(x).hexdigest()
-
             hash_utf8 = sha256_utf8
-        elif _algorithm == "SHA-512":
-
+        elif _algorithm == 'SHA-512':
             def sha512_utf8(x):
                 if isinstance(x, str):
-                    x = x.encode("utf-8")
+                    x = x.encode('utf-8')
                 return hashlib.sha512(x).hexdigest()
-
             hash_utf8 = sha512_utf8
 
-        KD = lambda s, d: hash_utf8(f"{s}:{d}")  # noqa:E731
+        KD = lambda s, d: hash_utf8("%s:%s" % (s, d))
 
         if hash_utf8 is None:
             return None
@@ -184,10 +177,10 @@ class HTTPDigestAuth(AuthBase):
         #: path is request-uri defined in RFC 2616 which should not be empty
         path = p_parsed.path or "/"
         if p_parsed.query:
-            path += f"?{p_parsed.query}"
+            path += '?' + p_parsed.query
 
-        A1 = f"{self.username}:{realm}:{self.password}"
-        A2 = f"{method}:{path}"
+        A1 = '%s:%s:%s' % (self.username, realm, self.password)
+        A2 = '%s:%s' % (method, path)
 
         HA1 = hash_utf8(A1)
         HA2 = hash_utf8(A2)
@@ -196,20 +189,22 @@ class HTTPDigestAuth(AuthBase):
             self._thread_local.nonce_count += 1
         else:
             self._thread_local.nonce_count = 1
-        ncvalue = f"{self._thread_local.nonce_count:08x}"
-        s = str(self._thread_local.nonce_count).encode("utf-8")
-        s += nonce.encode("utf-8")
-        s += time.ctime().encode("utf-8")
+        ncvalue = '%08x' % self._thread_local.nonce_count
+        s = str(self._thread_local.nonce_count).encode('utf-8')
+        s += nonce.encode('utf-8')
+        s += time.ctime().encode('utf-8')
         s += os.urandom(8)
 
-        cnonce = hashlib.sha1(s).hexdigest()[:16]
-        if _algorithm == "MD5-SESS":
-            HA1 = hash_utf8(f"{HA1}:{nonce}:{cnonce}")
+        cnonce = (hashlib.sha1(s).hexdigest()[:16])
+        if _algorithm == 'MD5-SESS':
+            HA1 = hash_utf8('%s:%s:%s' % (HA1, nonce, cnonce))
 
         if not qop:
-            respdig = KD(HA1, f"{nonce}:{HA2}")
-        elif qop == "auth" or "auth" in qop.split(","):
-            noncebit = f"{nonce}:{ncvalue}:{cnonce}:auth:{HA2}"
+            respdig = KD(HA1, "%s:%s" % (nonce, HA2))
+        elif qop == 'auth' or 'auth' in qop.split(','):
+            noncebit = "%s:%s:%s:%s:%s" % (
+                nonce, ncvalue, cnonce, 'auth', HA2
+            )
             respdig = KD(HA1, noncebit)
         else:
             # XXX handle auth-int.
@@ -218,20 +213,18 @@ class HTTPDigestAuth(AuthBase):
         self._thread_local.last_nonce = nonce
 
         # XXX should the partial digests be encoded too?
-        base = (
-            f'username="{self.username}", realm="{realm}", nonce="{nonce}", '
-            f'uri="{path}", response="{respdig}"'
-        )
+        base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
+               'response="%s"' % (self.username, realm, nonce, path, respdig)
         if opaque:
-            base += f', opaque="{opaque}"'
+            base += ', opaque="%s"' % opaque
         if algorithm:
-            base += f', algorithm="{algorithm}"'
+            base += ', algorithm="%s"' % algorithm
         if entdig:
-            base += f', digest="{entdig}"'
+            base += ', digest="%s"' % entdig
         if qop:
-            base += f', qop="auth", nc={ncvalue}, cnonce="{cnonce}"'
+            base += ', qop="auth", nc=%s, cnonce="%s"' % (ncvalue, cnonce)
 
-        return f"Digest {base}"
+        return 'Digest %s' % (base)
 
     def handle_redirect(self, r, **kwargs):
         """Reset num_401_calls counter on redirects."""
@@ -255,13 +248,13 @@ class HTTPDigestAuth(AuthBase):
             # Rewind the file position indicator of the body to where
             # it was to resend the request.
             r.request.body.seek(self._thread_local.pos)
-        s_auth = r.headers.get("www-authenticate", "")
+        s_auth = r.headers.get('www-authenticate', '')
 
-        if "digest" in s_auth.lower() and self._thread_local.num_401_calls < 2:
+        if 'digest' in s_auth.lower() and self._thread_local.num_401_calls < 2:
 
             self._thread_local.num_401_calls += 1
-            pat = re.compile(r"digest ", flags=re.IGNORECASE)
-            self._thread_local.chal = parse_dict_header(pat.sub("", s_auth, count=1))
+            pat = re.compile(r'digest ', flags=re.IGNORECASE)
+            self._thread_local.chal = parse_dict_header(pat.sub('', s_auth, count=1))
 
             # Consume content and release the original connection
             # to allow our new request to reuse the same one.
@@ -271,9 +264,8 @@ class HTTPDigestAuth(AuthBase):
             extract_cookies_to_jar(prep._cookies, r.request, r.raw)
             prep.prepare_cookies(prep._cookies)
 
-            prep.headers["Authorization"] = self.build_digest_header(
-                prep.method, prep.url
-            )
+            prep.headers['Authorization'] = self.build_digest_header(
+                prep.method, prep.url)
             _r = r.connection.send(prep, **kwargs)
             _r.history.append(r)
             _r.request = prep
@@ -288,7 +280,7 @@ class HTTPDigestAuth(AuthBase):
         self.init_per_thread_state()
         # If we have a saved nonce, skip the 401
         if self._thread_local.last_nonce:
-            r.headers["Authorization"] = self.build_digest_header(r.method, r.url)
+            r.headers['Authorization'] = self.build_digest_header(r.method, r.url)
         try:
             self._thread_local.pos = r.body.tell()
         except AttributeError:
@@ -297,19 +289,17 @@ class HTTPDigestAuth(AuthBase):
             # file position of the previous body. Ensure it's set to
             # None.
             self._thread_local.pos = None
-        r.register_hook("response", self.handle_401)
-        r.register_hook("response", self.handle_redirect)
+        r.register_hook('response', self.handle_401)
+        r.register_hook('response', self.handle_redirect)
         self._thread_local.num_401_calls = 1
 
         return r
 
     def __eq__(self, other):
-        return all(
-            [
-                self.username == getattr(other, "username", None),
-                self.password == getattr(other, "password", None),
-            ]
-        )
+        return all([
+            self.username == getattr(other, 'username', None),
+            self.password == getattr(other, 'password', None)
+        ])
 
     def __ne__(self, other):
         return not self == other

requests/certs.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 """
 requests.certs
@@ -13,5 +14,5 @@ packaged CA bundle.
 """
 from certifi import where
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     print(where())

requests/compat.py

@@ -1,16 +1,14 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.compat
 ~~~~~~~~~~~~~~~
 
-This module previously handled import compatibility issues
-between Python 2 and Python 3. It remains for backwards
-compatibility until the next major version.
+This module handles import compatibility issues between Python 2 and
+Python 3.
 """
 
-try:
-    import chardet
-except ImportError:
-    import charset_normalizer as chardet
+import chardet
 
 import sys
 
@@ -22,58 +20,63 @@ import sys
 _ver = sys.version_info
 
 #: Python 2.x?
-is_py2 = _ver[0] == 2
+is_py2 = (_ver[0] == 2)
 
 #: Python 3.x?
-is_py3 = _ver[0] == 3
+is_py3 = (_ver[0] == 3)
 
-# json/simplejson module import resolution
-has_simplejson = False
 try:
     import simplejson as json
-
-    has_simplejson = True
 except ImportError:
     import json
 
-if has_simplejson:
-    from simplejson import JSONDecodeError
-else:
-    from json import JSONDecodeError
 
-# Keep OrderedDict for backwards compatibility.
-from collections import OrderedDict
-from collections.abc import Callable, Mapping, MutableMapping
-from http import cookiejar as cookielib
-from http.cookies import Morsel
-from io import StringIO
+import urllib3
 
-# --------------
-# Legacy Imports
-# --------------
-from urllib.parse import (
-    quote,
-    quote_plus,
-    unquote,
-    unquote_plus,
-    urldefrag,
-    urlencode,
-    urljoin,
-    urlparse,
-    urlsplit,
-    urlunparse,
-)
-from urllib.request import (
-    getproxies,
-    getproxies_environment,
-    parse_http_list,
-    proxy_bypass,
-    proxy_bypass_environment,
-)
+try:
+    SKIP_HEADER = urllib3.util.SKIP_HEADER
+    SKIPPABLE_HEADERS = urllib3.util.SKIPPABLE_HEADERS
+except AttributeError:
+    SKIP_HEADER = None
+    SKIPPABLE_HEADERS = frozenset([])
 
-builtin_str = str
-str = str
-bytes = bytes
-basestring = (str, bytes)
-numeric_types = (int, float)
-integer_types = (int,)
+# ---------
+# Specifics
+# ---------
+
+if is_py2:
+    from urllib import (
+        quote, unquote, quote_plus, unquote_plus, urlencode, getproxies,
+        proxy_bypass, proxy_bypass_environment, getproxies_environment)
+    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
+    from urllib2 import parse_http_list
+    import cookielib
+    from Cookie import Morsel
+    from StringIO import StringIO
+    # Keep OrderedDict for backwards compatibility.
+    from collections import Callable, Mapping, MutableMapping, OrderedDict
+
+
+    builtin_str = str
+    bytes = str
+    str = unicode
+    basestring = basestring
+    numeric_types = (int, long, float)
+    integer_types = (int, long)
+
+elif is_py3:
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
+    from urllib.request import parse_http_list, getproxies, proxy_bypass, proxy_bypass_environment, getproxies_environment
+    from http import cookiejar as cookielib
+    from http.cookies import Morsel
+    from io import StringIO
+    # Keep OrderedDict for backwards compatibility.
+    from collections import OrderedDict
+    from collections.abc import Callable, Mapping, MutableMapping
+
+    builtin_str = str
+    str = str
+    bytes = bytes
+    basestring = (str, bytes)
+    numeric_types = (int, float)
+    integer_types = (int,)

requests/cookies.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.cookies
 ~~~~~~~~~~~~~~~~
@@ -7,12 +9,12 @@ Compatibility code to be able to use `cookielib.CookieJar` with requests.
 requests.utils imports from here, so be careful with imports.
 """
 
-import calendar
 import copy
 import time
+import calendar
 
 from ._internal_utils import to_native_string
-from .compat import Morsel, MutableMapping, cookielib, urlparse, urlunparse
+from .compat import cookielib, urlparse, urlunparse, Morsel, MutableMapping
 
 try:
     import threading
@@ -20,7 +22,7 @@ except ImportError:
     import dummy_threading as threading
 
 
-class MockRequest:
+class MockRequest(object):
     """Wraps a `requests.Request` to mimic a `urllib2.Request`.
 
     The code in `cookielib.CookieJar` expects this interface in order to correctly
@@ -49,22 +51,16 @@ class MockRequest:
     def get_full_url(self):
         # Only return the response's URL if the user hadn't set the Host
         # header
-        if not self._r.headers.get("Host"):
+        if not self._r.headers.get('Host'):
             return self._r.url
         # If they did set it, retrieve it and reconstruct the expected domain
-        host = to_native_string(self._r.headers["Host"], encoding="utf-8")
+        host = to_native_string(self._r.headers['Host'], encoding='utf-8')
         parsed = urlparse(self._r.url)
         # Reconstruct the URL as we expect it
-        return urlunparse(
-            [
-                parsed.scheme,
-                host,
-                parsed.path,
-                parsed.params,
-                parsed.query,
-                parsed.fragment,
-            ]
-        )
+        return urlunparse([
+            parsed.scheme, host, parsed.path, parsed.params, parsed.query,
+            parsed.fragment
+        ])
 
     def is_unverifiable(self):
         return True
@@ -77,9 +73,7 @@ class MockRequest:
 
     def add_header(self, key, val):
         """cookielib has no legitimate use for this method; add it back if you find one."""
-        raise NotImplementedError(
-            "Cookie headers should be added with add_unredirected_header()"
-        )
+        raise NotImplementedError("Cookie headers should be added with add_unredirected_header()")
 
     def add_unredirected_header(self, name, value):
         self._new_headers[name] = value
@@ -100,7 +94,7 @@ class MockRequest:
         return self.get_host()
 
 
-class MockResponse:
+class MockResponse(object):
     """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
 
     ...what? Basically, expose the parsed HTTP headers from the server response
@@ -128,7 +122,8 @@ def extract_cookies_to_jar(jar, request, response):
     :param request: our own requests.Request object
     :param response: urllib3.HTTPResponse object
     """
-    if not (hasattr(response, "_original_response") and response._original_response):
+    if not (hasattr(response, '_original_response') and
+            response._original_response):
         return
     # the _original_response field is the wrapped httplib.HTTPResponse object,
     req = MockRequest(request)
@@ -145,7 +140,7 @@ def get_cookie_header(jar, request):
     """
     r = MockRequest(request)
     jar.add_cookie_header(r)
-    return r.get_new_headers().get("Cookie")
+    return r.get_new_headers().get('Cookie')
 
 
 def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
@@ -210,9 +205,7 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
         """
         # support client code that unsets cookies by assignment of a None value:
         if value is None:
-            remove_cookie_by_name(
-                self, name, domain=kwargs.get("domain"), path=kwargs.get("path")
-            )
+            remove_cookie_by_name(self, name, domain=kwargs.get('domain'), path=kwargs.get('path'))
             return
 
         if isinstance(value, Morsel):
@@ -312,15 +305,16 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
         """
         dictionary = {}
         for cookie in iter(self):
-            if (domain is None or cookie.domain == domain) and (
-                path is None or cookie.path == path
+            if (
+                (domain is None or cookie.domain == domain) and
+                (path is None or cookie.path == path)
             ):
                 dictionary[cookie.name] = cookie.value
         return dictionary
 
     def __contains__(self, name):
         try:
-            return super().__contains__(name)
+            return super(RequestsCookieJar, self).__contains__(name)
         except CookieConflictError:
             return True
 
@@ -347,13 +341,9 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
         remove_cookie_by_name(self, name)
 
     def set_cookie(self, cookie, *args, **kwargs):
-        if (
-            hasattr(cookie.value, "startswith")
-            and cookie.value.startswith('"')
-            and cookie.value.endswith('"')
-        ):
-            cookie.value = cookie.value.replace('\\"', "")
-        return super().set_cookie(cookie, *args, **kwargs)
+        if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
+            cookie.value = cookie.value.replace('\\"', '')
+        return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
 
     def update(self, other):
         """Updates this jar with cookies from another CookieJar or dict-like"""
@@ -361,7 +351,7 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
             for cookie in other:
                 self.set_cookie(copy.copy(cookie))
         else:
-            super().update(other)
+            super(RequestsCookieJar, self).update(other)
 
     def _find(self, name, domain=None, path=None):
         """Requests uses this method internally to get cookie values.
@@ -381,7 +371,7 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
                     if path is None or cookie.path == path:
                         return cookie.value
 
-        raise KeyError(f"name={name!r}, domain={domain!r}, path={path!r}")
+        raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
 
     def _find_no_duplicates(self, name, domain=None, path=None):
         """Both ``__get_item__`` and ``get`` call this function: it's never
@@ -400,29 +390,25 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
             if cookie.name == name:
                 if domain is None or cookie.domain == domain:
                     if path is None or cookie.path == path:
-                        if toReturn is not None:
-                            # if there are multiple cookies that meet passed in criteria
-                            raise CookieConflictError(
-                                f"There are multiple cookies with name, {name!r}"
-                            )
-                        # we will eventually return this as long as no cookie conflict
-                        toReturn = cookie.value
+                        if toReturn is not None:  # if there are multiple cookies that meet passed in criteria
+                            raise CookieConflictError('There are multiple cookies with name, %r' % (name))
+                        toReturn = cookie.value  # we will eventually return this as long as no cookie conflict
 
         if toReturn:
             return toReturn
-        raise KeyError(f"name={name!r}, domain={domain!r}, path={path!r}")
+        raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
 
     def __getstate__(self):
         """Unlike a normal CookieJar, this class is pickleable."""
         state = self.__dict__.copy()
         # remove the unpickleable RLock object
-        state.pop("_cookies_lock")
+        state.pop('_cookies_lock')
         return state
 
     def __setstate__(self, state):
         """Unlike a normal CookieJar, this class is pickleable."""
         self.__dict__.update(state)
-        if "_cookies_lock" not in self.__dict__:
+        if '_cookies_lock' not in self.__dict__:
             self._cookies_lock = threading.RLock()
 
     def copy(self):
@@ -441,7 +427,7 @@ def _copy_cookie_jar(jar):
     if jar is None:
         return None
 
-    if hasattr(jar, "copy"):
+    if hasattr(jar, 'copy'):
         # We're dealing with an instance of RequestsCookieJar
         return jar.copy()
     # We're dealing with a generic CookieJar instance
@@ -459,32 +445,31 @@ def create_cookie(name, value, **kwargs):
     and sent on every request (this is sometimes called a "supercookie").
     """
     result = {
-        "version": 0,
-        "name": name,
-        "value": value,
-        "port": None,
-        "domain": "",
-        "path": "/",
-        "secure": False,
-        "expires": None,
-        "discard": True,
-        "comment": None,
-        "comment_url": None,
-        "rest": {"HttpOnly": None},
-        "rfc2109": False,
+        'version': 0,
+        'name': name,
+        'value': value,
+        'port': None,
+        'domain': '',
+        'path': '/',
+        'secure': False,
+        'expires': None,
+        'discard': True,
+        'comment': None,
+        'comment_url': None,
+        'rest': {'HttpOnly': None},
+        'rfc2109': False,
     }
 
     badargs = set(kwargs) - set(result)
     if badargs:
-        raise TypeError(
-            f"create_cookie() got unexpected keyword arguments: {list(badargs)}"
-        )
+        err = 'create_cookie() got unexpected keyword arguments: %s'
+        raise TypeError(err % list(badargs))
 
     result.update(kwargs)
-    result["port_specified"] = bool(result["port"])
-    result["domain_specified"] = bool(result["domain"])
-    result["domain_initial_dot"] = result["domain"].startswith(".")
-    result["path_specified"] = bool(result["path"])
+    result['port_specified'] = bool(result['port'])
+    result['domain_specified'] = bool(result['domain'])
+    result['domain_initial_dot'] = result['domain'].startswith('.')
+    result['path_specified'] = bool(result['path'])
 
     return cookielib.Cookie(**result)
 
@@ -493,28 +478,30 @@ def morsel_to_cookie(morsel):
     """Convert a Morsel object into a Cookie containing the one k/v pair."""
 
     expires = None
-    if morsel["max-age"]:
+    if morsel['max-age']:
         try:
-            expires = int(time.time() + int(morsel["max-age"]))
+            expires = int(time.time() + int(morsel['max-age']))
         except ValueError:
-            raise TypeError(f"max-age: {morsel['max-age']} must be integer")
-    elif morsel["expires"]:
-        time_template = "%a, %d-%b-%Y %H:%M:%S GMT"
-        expires = calendar.timegm(time.strptime(morsel["expires"], time_template))
+            raise TypeError('max-age: %s must be integer' % morsel['max-age'])
+    elif morsel['expires']:
+        time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
+        expires = calendar.timegm(
+            time.strptime(morsel['expires'], time_template)
+        )
     return create_cookie(
-        comment=morsel["comment"],
-        comment_url=bool(morsel["comment"]),
+        comment=morsel['comment'],
+        comment_url=bool(morsel['comment']),
         discard=False,
-        domain=morsel["domain"],
+        domain=morsel['domain'],
         expires=expires,
         name=morsel.key,
-        path=morsel["path"],
+        path=morsel['path'],
         port=None,
-        rest={"HttpOnly": morsel["httponly"]},
+        rest={'HttpOnly': morsel['httponly']},
         rfc2109=False,
-        secure=bool(morsel["secure"]),
+        secure=bool(morsel['secure']),
         value=morsel.value,
-        version=morsel["version"] or 0,
+        version=morsel['version'] or 0,
     )
 
 
@@ -547,10 +534,11 @@ def merge_cookies(cookiejar, cookies):
     :rtype: CookieJar
     """
     if not isinstance(cookiejar, cookielib.CookieJar):
-        raise ValueError("You can only merge into CookieJar")
+        raise ValueError('You can only merge into CookieJar')
 
     if isinstance(cookies, dict):
-        cookiejar = cookiejar_from_dict(cookies, cookiejar=cookiejar, overwrite=False)
+        cookiejar = cookiejar_from_dict(
+            cookies, cookiejar=cookiejar, overwrite=False)
     elif isinstance(cookies, cookielib.CookieJar):
         try:
             cookiejar.update(cookies)

requests/exceptions.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.exceptions
 ~~~~~~~~~~~~~~~~~~~
@@ -6,8 +8,6 @@ This module contains the set of Requests' exceptions.
 """
 from urllib3.exceptions import HTTPError as BaseHTTPError
 
-from .compat import JSONDecodeError as CompatJSONDecodeError
-
 
 class RequestException(IOError):
     """There was an ambiguous exception that occurred while handling your
@@ -16,30 +16,13 @@ class RequestException(IOError):
 
     def __init__(self, *args, **kwargs):
         """Initialize RequestException with `request` and `response` objects."""
-        response = kwargs.pop("response", None)
+        response = kwargs.pop('response', None)
         self.response = response
-        self.request = kwargs.pop("request", None)
-        if response is not None and not self.request and hasattr(response, "request"):
+        self.request = kwargs.pop('request', None)
+        if (response is not None and not self.request and
+                hasattr(response, 'request')):
             self.request = self.response.request
-        super().__init__(*args, **kwargs)
-
-
-class InvalidJSONError(RequestException):
-    """A JSON error occurred."""
-
-
-class JSONDecodeError(InvalidJSONError, CompatJSONDecodeError):
-    """Couldn't decode the text into json"""
-
-    def __init__(self, *args, **kwargs):
-        """
-        Construct the JSONDecodeError instance first with all
-        args. Then use it's args to construct the IOError so that
-        the json specific args aren't used as IOError specific args
-        and the error message from JSONDecodeError is preserved.
-        """
-        CompatJSONDecodeError.__init__(self, *args)
-        InvalidJSONError.__init__(self, *self.args, **kwargs)
+        super(RequestException, self).__init__(*args, **kwargs)
 
 
 class HTTPError(RequestException):
@@ -87,11 +70,11 @@ class TooManyRedirects(RequestException):
 
 
 class MissingSchema(RequestException, ValueError):
-    """The URL scheme (e.g. http or https) is missing."""
+    """The URL schema (e.g. http or https) is missing."""
 
 
 class InvalidSchema(RequestException, ValueError):
-    """The URL scheme provided is either invalid or unsupported."""
+    """See defaults.py for valid schemas."""
 
 
 class InvalidURL(RequestException, ValueError):
@@ -125,7 +108,6 @@ class RetryError(RequestException):
 class UnrewindableBodyError(RequestException):
     """Requests encountered an error when trying to rewind a body."""
 
-
 # Warnings
 
 

requests/help.py

@@ -1,25 +1,17 @@
 """Module containing bug report helper(s)."""
+from __future__ import print_function
 
 import json
 import platform
-import ssl
 import sys
+import ssl
 
 import idna
 import urllib3
+import chardet
 
 from . import __version__ as requests_version
 
-try:
-    import charset_normalizer
-except ImportError:
-    charset_normalizer = None
-
-try:
-    import chardet
-except ImportError:
-    chardet = None
-
 try:
     from urllib3.contrib import pyopenssl
 except ImportError:
@@ -27,16 +19,16 @@ except ImportError:
     OpenSSL = None
     cryptography = None
 else:
-    import cryptography
     import OpenSSL
+    import cryptography
 
 
 def _implementation():
     """Return a dict with the Python implementation and version.
 
     Provide both the name and the version of the Python implementation
-    currently running. For example, on CPython 3.10.3 it will return
-    {'name': 'CPython', 'version': '3.10.3'}.
+    currently running. For example, on CPython 2.7.5 it will return
+    {'name': 'CPython', 'version': '2.7.5'}.
 
     This function works best on CPython and PyPy: in particular, it probably
     doesn't work for Jython or IronPython. Future investigation should be done
@@ -44,83 +36,76 @@ def _implementation():
     """
     implementation = platform.python_implementation()
 
-    if implementation == "CPython":
+    if implementation == 'CPython':
         implementation_version = platform.python_version()
-    elif implementation == "PyPy":
-        implementation_version = "{}.{}.{}".format(
-            sys.pypy_version_info.major,
-            sys.pypy_version_info.minor,
-            sys.pypy_version_info.micro,
-        )
-        if sys.pypy_version_info.releaselevel != "final":
-            implementation_version = "".join(
-                [implementation_version, sys.pypy_version_info.releaselevel]
-            )
-    elif implementation == "Jython":
+    elif implementation == 'PyPy':
+        implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major,
+                                               sys.pypy_version_info.minor,
+                                               sys.pypy_version_info.micro)
+        if sys.pypy_version_info.releaselevel != 'final':
+            implementation_version = ''.join([
+                implementation_version, sys.pypy_version_info.releaselevel
+            ])
+    elif implementation == 'Jython':
         implementation_version = platform.python_version()  # Complete Guess
-    elif implementation == "IronPython":
+    elif implementation == 'IronPython':
         implementation_version = platform.python_version()  # Complete Guess
     else:
-        implementation_version = "Unknown"
+        implementation_version = 'Unknown'
 
-    return {"name": implementation, "version": implementation_version}
+    return {'name': implementation, 'version': implementation_version}
 
 
 def info():
     """Generate information for a bug report."""
     try:
         platform_info = {
-            "system": platform.system(),
-            "release": platform.release(),
+            'system': platform.system(),
+            'release': platform.release(),
         }
-    except OSError:
+    except IOError:
         platform_info = {
-            "system": "Unknown",
-            "release": "Unknown",
+            'system': 'Unknown',
+            'release': 'Unknown',
         }
 
     implementation_info = _implementation()
-    urllib3_info = {"version": urllib3.__version__}
-    charset_normalizer_info = {"version": None}
-    chardet_info = {"version": None}
-    if charset_normalizer:
-        charset_normalizer_info = {"version": charset_normalizer.__version__}
-    if chardet:
-        chardet_info = {"version": chardet.__version__}
+    urllib3_info = {'version': urllib3.__version__}
+    chardet_info = {'version': chardet.__version__}
 
     pyopenssl_info = {
-        "version": None,
-        "openssl_version": "",
+        'version': None,
+        'openssl_version': '',
     }
     if OpenSSL:
         pyopenssl_info = {
-            "version": OpenSSL.__version__,
-            "openssl_version": f"{OpenSSL.SSL.OPENSSL_VERSION_NUMBER:x}",
+            'version': OpenSSL.__version__,
+            'openssl_version': '%x' % OpenSSL.SSL.OPENSSL_VERSION_NUMBER,
         }
     cryptography_info = {
-        "version": getattr(cryptography, "__version__", ""),
+        'version': getattr(cryptography, '__version__', ''),
     }
     idna_info = {
-        "version": getattr(idna, "__version__", ""),
+        'version': getattr(idna, '__version__', ''),
     }
 
     system_ssl = ssl.OPENSSL_VERSION_NUMBER
-    system_ssl_info = {"version": f"{system_ssl:x}" if system_ssl is not None else ""}
+    system_ssl_info = {
+        'version': '%x' % system_ssl if system_ssl is not None else ''
+    }
 
     return {
-        "platform": platform_info,
-        "implementation": implementation_info,
-        "system_ssl": system_ssl_info,
-        "using_pyopenssl": pyopenssl is not None,
-        "using_charset_normalizer": chardet is None,
-        "pyOpenSSL": pyopenssl_info,
-        "urllib3": urllib3_info,
-        "chardet": chardet_info,
-        "charset_normalizer": charset_normalizer_info,
-        "cryptography": cryptography_info,
-        "idna": idna_info,
-        "requests": {
-            "version": requests_version,
+        'platform': platform_info,
+        'implementation': implementation_info,
+        'system_ssl': system_ssl_info,
+        'using_pyopenssl': pyopenssl is not None,
+        'pyOpenSSL': pyopenssl_info,
+        'urllib3': urllib3_info,
+        'chardet': chardet_info,
+        'cryptography': cryptography_info,
+        'idna': idna_info,
+        'requests': {
+            'version': requests_version,
         },
     }
 
@@ -130,5 +115,5 @@ def main():
     print(json.dumps(info(), sort_keys=True, indent=2))
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()

requests/hooks.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.hooks
 ~~~~~~~~~~~~~~
@@ -9,13 +11,12 @@ Available hooks:
 ``response``:
     The response generated from a Request.
 """
-HOOKS = ["response"]
+HOOKS = ['response']
 
 
 def default_hooks():
     return {event: [] for event in HOOKS}
 
-
 # TODO: response is the only one
 
 
@@ -24,7 +25,7 @@ def dispatch_hook(key, hooks, hook_data, **kwargs):
     hooks = hooks or {}
     hooks = hooks.get(key)
     if hooks:
-        if hasattr(hooks, "__call__"):
+        if hasattr(hooks, '__call__'):
             hooks = [hooks]
         for hook in hooks:
             _hook_data = hook(hook_data, **kwargs)

requests/models.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.models
 ~~~~~~~~~~~~~~~
@@ -6,72 +8,59 @@ This module contains the primary objects that power Requests.
 """
 
 import datetime
+import sys
 
 # Import encoding now, to avoid implicit import later.
 # Implicit import within threads may cause LookupError when standard library is in a ZIP,
 # such as in Embedded Python. See https://github.com/psf/requests/issues/3578.
-import encodings.idna  # noqa: F401
-from io import UnsupportedOperation
+import encodings.idna
 
-from urllib3.exceptions import (
-    DecodeError,
-    LocationParseError,
-    ProtocolError,
-    ReadTimeoutError,
-    SSLError,
-)
+import urllib3
 from urllib3.fields import RequestField
 from urllib3.filepost import encode_multipart_formdata
 from urllib3.util import parse_url
+from urllib3.exceptions import (
+    DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
+
+from io import UnsupportedOperation
+from .hooks import default_hooks
+from .structures import CaseInsensitiveDict
 
-from ._internal_utils import to_native_string, unicode_is_ascii
 from .auth import HTTPBasicAuth
+from .cookies import cookiejar_from_dict, get_cookie_header, _copy_cookie_jar
+from .exceptions import (
+    HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
+    ContentDecodingError, ConnectionError, StreamConsumedError)
+from ._internal_utils import to_native_string, unicode_is_ascii
+from .utils import (
+    guess_filename, get_auth_from_url, requote_uri,
+    stream_decode_response_unicode, to_key_val_list, parse_header_links,
+    iter_slices, guess_json_utf, super_len, check_header_validity)
 from .compat import (
+    SKIP_HEADER,
+    SKIPPABLE_HEADERS,
     Callable,
-    JSONDecodeError,
     Mapping,
-    basestring,
-    builtin_str,
-    chardet,
     cookielib,
+    urlunparse,
+    urlsplit,
+    urlencode,
+    str,
+    bytes,
+    is_py2,
+    chardet,
+    builtin_str,
+    basestring,
 )
 from .compat import json as complexjson
-from .compat import urlencode, urlsplit, urlunparse
-from .cookies import _copy_cookie_jar, cookiejar_from_dict, get_cookie_header
-from .exceptions import (
-    ChunkedEncodingError,
-    ConnectionError,
-    ContentDecodingError,
-    HTTPError,
-    InvalidJSONError,
-    InvalidURL,
-)
-from .exceptions import JSONDecodeError as RequestsJSONDecodeError
-from .exceptions import MissingSchema
-from .exceptions import SSLError as RequestsSSLError
-from .exceptions import StreamConsumedError
-from .hooks import default_hooks
 from .status_codes import codes
-from .structures import CaseInsensitiveDict
-from .utils import (
-    check_header_validity,
-    get_auth_from_url,
-    guess_filename,
-    guess_json_utf,
-    iter_slices,
-    parse_header_links,
-    requote_uri,
-    stream_decode_response_unicode,
-    super_len,
-    to_key_val_list,
-)
 
 #: The set of HTTP status codes that indicate an automatically
 #: processable redirect.
 REDIRECT_STATI = (
-    codes.moved,  # 301
-    codes.found,  # 302
-    codes.other,  # 303
+    codes.moved,               # 301
+    codes.found,               # 302
+    codes.other,               # 303
     codes.temporary_redirect,  # 307
     codes.permanent_redirect,  # 308
 )
@@ -81,7 +70,7 @@ CONTENT_CHUNK_SIZE = 10 * 1024
 ITER_CHUNK_SIZE = 512
 
 
-class RequestEncodingMixin:
+class RequestEncodingMixin(object):
     @property
     def path_url(self):
         """Build the path URL to use."""
@@ -92,16 +81,16 @@ class RequestEncodingMixin:
 
         path = p.path
         if not path:
-            path = "/"
+            path = '/'
 
         url.append(path)
 
         query = p.query
         if query:
-            url.append("?")
+            url.append('?')
             url.append(query)
 
-        return "".join(url)
+        return ''.join(url)
 
     @staticmethod
     def _encode_params(data):
@@ -114,21 +103,18 @@ class RequestEncodingMixin:
 
         if isinstance(data, (str, bytes)):
             return data
-        elif hasattr(data, "read"):
+        elif hasattr(data, 'read'):
             return data
-        elif hasattr(data, "__iter__"):
+        elif hasattr(data, '__iter__'):
             result = []
             for k, vs in to_key_val_list(data):
-                if isinstance(vs, basestring) or not hasattr(vs, "__iter__"):
+                if isinstance(vs, basestring) or not hasattr(vs, '__iter__'):
                     vs = [vs]
                 for v in vs:
                     if v is not None:
                         result.append(
-                            (
-                                k.encode("utf-8") if isinstance(k, str) else k,
-                                v.encode("utf-8") if isinstance(v, str) else v,
-                            )
-                        )
+                            (k.encode('utf-8') if isinstance(k, str) else k,
+                             v.encode('utf-8') if isinstance(v, str) else v))
             return urlencode(result, doseq=True)
         else:
             return data
@@ -143,7 +129,7 @@ class RequestEncodingMixin:
         The tuples may be 2-tuples (filename, fileobj), 3-tuples (filename, fileobj, contentype)
         or 4-tuples (filename, fileobj, contentype, custom_headers).
         """
-        if not files:
+        if (not files):
             raise ValueError("Files must be provided.")
         elif isinstance(data, basestring):
             raise ValueError("Data must not be a string.")
@@ -153,7 +139,7 @@ class RequestEncodingMixin:
         files = to_key_val_list(files or {})
 
         for field, val in fields:
-            if isinstance(val, basestring) or not hasattr(val, "__iter__"):
+            if isinstance(val, basestring) or not hasattr(val, '__iter__'):
                 val = [val]
             for v in val:
                 if v is not None:
@@ -162,13 +148,8 @@ class RequestEncodingMixin:
                         v = str(v)
 
                     new_fields.append(
-                        (
-                            field.decode("utf-8")
-                            if isinstance(field, bytes)
-                            else field,
-                            v.encode("utf-8") if isinstance(v, str) else v,
-                        )
-                    )
+                        (field.decode('utf-8') if isinstance(field, bytes) else field,
+                         v.encode('utf-8') if isinstance(v, str) else v))
 
         for (k, v) in files:
             # support for explicit filename
@@ -187,7 +168,7 @@ class RequestEncodingMixin:
 
             if isinstance(fp, (str, bytes, bytearray)):
                 fdata = fp
-            elif hasattr(fp, "read"):
+            elif hasattr(fp, 'read'):
                 fdata = fp.read()
             elif fp is None:
                 continue
@@ -203,16 +184,16 @@ class RequestEncodingMixin:
         return body, content_type
 
 
-class RequestHooksMixin:
+class RequestHooksMixin(object):
     def register_hook(self, event, hook):
         """Properly register a hook."""
 
         if event not in self.hooks:
-            raise ValueError(f'Unsupported event specified, with event name "{event}"')
+            raise ValueError('Unsupported event specified, with event name "%s"' % (event))
 
         if isinstance(hook, Callable):
             self.hooks[event].append(hook)
-        elif hasattr(hook, "__iter__"):
+        elif hasattr(hook, '__iter__'):
             self.hooks[event].extend(h for h in hook if isinstance(h, Callable))
 
     def deregister_hook(self, event, hook):
@@ -255,19 +236,9 @@ class Request(RequestHooksMixin):
       <PreparedRequest [GET]>
     """
 
-    def __init__(
-        self,
-        method=None,
-        url=None,
-        headers=None,
-        files=None,
-        data=None,
-        params=None,
-        auth=None,
-        cookies=None,
-        hooks=None,
-        json=None,
-    ):
+    def __init__(self,
+            method=None, url=None, headers=None, files=None, data=None,
+            params=None, auth=None, cookies=None, hooks=None, json=None):
 
         # Default empty dicts for dict params.
         data = [] if data is None else data
@@ -291,7 +262,7 @@ class Request(RequestHooksMixin):
         self.cookies = cookies
 
     def __repr__(self):
-        return f"<Request [{self.method}]>"
+        return '<Request [%s]>' % (self.method)
 
     def prepare(self):
         """Constructs a :class:`PreparedRequest <PreparedRequest>` for transmission and returns it."""
@@ -349,19 +320,9 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         #: integer denoting starting position of a readable file-like body.
         self._body_position = None
 
-    def prepare(
-        self,
-        method=None,
-        url=None,
-        headers=None,
-        files=None,
-        data=None,
-        params=None,
-        auth=None,
-        cookies=None,
-        hooks=None,
-        json=None,
-    ):
+    def prepare(self,
+            method=None, url=None, headers=None, files=None, data=None,
+            params=None, auth=None, cookies=None, hooks=None, json=None):
         """Prepares the entire request with the given parameters."""
 
         self.prepare_method(method)
@@ -378,7 +339,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         self.prepare_hooks(hooks)
 
     def __repr__(self):
-        return f"<PreparedRequest [{self.method}]>"
+        return '<PreparedRequest [%s]>' % (self.method)
 
     def copy(self):
         p = PreparedRequest()
@@ -402,7 +363,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         import idna
 
         try:
-            host = idna.encode(host, uts46=True).decode("utf-8")
+            host = idna.encode(host, uts46=True).decode('utf-8')
         except idna.IDNAError:
             raise UnicodeError
         return host
@@ -415,9 +376,9 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         #: on python 3.x.
         #: https://github.com/psf/requests/pull/2238
         if isinstance(url, bytes):
-            url = url.decode("utf8")
+            url = url.decode('utf8')
         else:
-            url = str(url)
+            url = unicode(url) if is_py2 else str(url)
 
         # Remove leading whitespaces from url
         url = url.lstrip()
@@ -425,7 +386,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         # Don't do any URL preparation for non-HTTP schemes like `mailto`,
         # `data` etc to work around exceptions from `url_parse`, which
         # handles RFC 3986 only.
-        if ":" in url and not url.lower().startswith("http"):
+        if ':' in url and not url.lower().startswith('http'):
             self.url = url
             return
 
@@ -436,13 +397,13 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             raise InvalidURL(*e.args)
 
         if not scheme:
-            raise MissingSchema(
-                f"Invalid URL {url!r}: No scheme supplied. "
-                f"Perhaps you meant https://{url}?"
-            )
+            error = ("Invalid URL {0!r}: No schema supplied. Perhaps you meant http://{0}?")
+            error = error.format(to_native_string(url, 'utf8'))
+
+            raise MissingSchema(error)
 
         if not host:
-            raise InvalidURL(f"Invalid URL {url!r}: No host supplied")
+            raise InvalidURL("Invalid URL %r: No host supplied" % url)
 
         # In general, we want to try IDNA encoding the hostname if the string contains
         # non-ASCII characters. This allows users to automatically get the correct IDNA
@@ -452,21 +413,33 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             try:
                 host = self._get_idna_encoded_host(host)
             except UnicodeError:
-                raise InvalidURL("URL has an invalid label.")
-        elif host.startswith(("*", ".")):
-            raise InvalidURL("URL has an invalid label.")
+                raise InvalidURL('URL has an invalid label.')
+        elif host.startswith(u'*'):
+            raise InvalidURL('URL has an invalid label.')
 
         # Carefully reconstruct the network location
-        netloc = auth or ""
+        netloc = auth or ''
         if netloc:
-            netloc += "@"
+            netloc += '@'
         netloc += host
         if port:
-            netloc += f":{port}"
+            netloc += ':' + str(port)
 
         # Bare domains aren't valid URLs.
         if not path:
-            path = "/"
+            path = '/'
+
+        if is_py2:
+            if isinstance(scheme, str):
+                scheme = scheme.encode('utf-8')
+            if isinstance(netloc, str):
+                netloc = netloc.encode('utf-8')
+            if isinstance(path, str):
+                path = path.encode('utf-8')
+            if isinstance(query, str):
+                query = query.encode('utf-8')
+            if isinstance(fragment, str):
+                fragment = fragment.encode('utf-8')
 
         if isinstance(params, (str, bytes)):
             params = to_native_string(params)
@@ -474,7 +447,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         enc_params = self._encode_params(params)
         if enc_params:
             if query:
-                query = f"{query}&{enc_params}"
+                query = '%s&%s' % (query, enc_params)
             else:
                 query = enc_params
 
@@ -487,9 +460,14 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         self.headers = CaseInsensitiveDict()
         if headers:
             for header in headers.items():
+                name, value = header
+                if value is None:
+                    if name.lower() in SKIPPABLE_HEADERS:
+                        value = SKIP_HEADER
+                    else:
+                        continue
                 # Raise exception on invalid header value.
                 check_header_validity(header)
-                name, value = header
                 self.headers[to_native_string(name)] = value
 
     def prepare_body(self, data, files, json=None):
@@ -505,22 +483,15 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         if not data and json is not None:
             # urllib3 requires a bytes-like body. Python 2's json.dumps
             # provides this natively, but Python 3 gives a Unicode string.
-            content_type = "application/json"
-
-            try:
-                body = complexjson.dumps(json, allow_nan=False)
-            except ValueError as ve:
-                raise InvalidJSONError(ve, request=self)
-
+            content_type = 'application/json'
+            body = complexjson.dumps(json)
             if not isinstance(body, bytes):
-                body = body.encode("utf-8")
+                body = body.encode('utf-8')
 
-        is_stream = all(
-            [
-                hasattr(data, "__iter__"),
-                not isinstance(data, (basestring, list, tuple, Mapping)),
-            ]
-        )
+        is_stream = all([
+            hasattr(data, '__iter__'),
+            not isinstance(data, (basestring, list, tuple, Mapping))
+        ])
 
         if is_stream:
             try:
@@ -530,26 +501,24 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
 
             body = data
 
-            if getattr(body, "tell", None) is not None:
+            if getattr(body, 'tell', None) is not None:
                 # Record the current file position before reading.
                 # This will allow us to rewind a file in the event
                 # of a redirect.
                 try:
                     self._body_position = body.tell()
-                except OSError:
+                except (IOError, OSError):
                     # This differentiates from None, allowing us to catch
                     # a failed `tell()` later when trying to rewind the body
                     self._body_position = object()
 
             if files:
-                raise NotImplementedError(
-                    "Streamed bodies and files are mutually exclusive."
-                )
+                raise NotImplementedError('Streamed bodies and files are mutually exclusive.')
 
             if length:
-                self.headers["Content-Length"] = builtin_str(length)
+                self.headers['Content-Length'] = builtin_str(length)
             else:
-                self.headers["Transfer-Encoding"] = "chunked"
+                self.headers['Transfer-Encoding'] = 'chunked'
         else:
             # Multi-part file uploads.
             if files:
@@ -557,16 +526,16 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             else:
                 if data:
                     body = self._encode_params(data)
-                    if isinstance(data, basestring) or hasattr(data, "read"):
+                    if isinstance(data, basestring) or hasattr(data, 'read'):
                         content_type = None
                     else:
-                        content_type = "application/x-www-form-urlencoded"
+                        content_type = 'application/x-www-form-urlencoded'
 
             self.prepare_content_length(body)
 
             # Add content-type if it wasn't explicitly provided.
-            if content_type and ("content-type" not in self.headers):
-                self.headers["Content-Type"] = content_type
+            if content_type and ('content-type' not in self.headers):
+                self.headers['Content-Type'] = content_type
 
         self.body = body
 
@@ -577,16 +546,13 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             if length:
                 # If length exists, set it. Otherwise, we fallback
                 # to Transfer-Encoding: chunked.
-                self.headers["Content-Length"] = builtin_str(length)
-        elif (
-            self.method not in ("GET", "HEAD")
-            and self.headers.get("Content-Length") is None
-        ):
+                self.headers['Content-Length'] = builtin_str(length)
+        elif self.method not in ('GET', 'HEAD') and self.headers.get('Content-Length') is None:
             # Set Content-Length to 0 for methods that can have a body
             # but don't provide one. (i.e. not GET or HEAD)
-            self.headers["Content-Length"] = "0"
+            self.headers['Content-Length'] = '0'
 
-    def prepare_auth(self, auth, url=""):
+    def prepare_auth(self, auth, url=''):
         """Prepares the given HTTP auth data."""
 
         # If no Auth is explicitly provided, extract it from the URL first.
@@ -626,7 +592,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
 
         cookie_header = get_cookie_header(self._cookies, self)
         if cookie_header is not None:
-            self.headers["Cookie"] = cookie_header
+            self.headers['Cookie'] = cookie_header
 
     def prepare_hooks(self, hooks):
         """Prepares the given hooks."""
@@ -638,22 +604,14 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             self.register_hook(event, hooks[event])
 
 
-class Response:
+class Response(object):
     """The :class:`Response <Response>` object, which contains a
     server's response to an HTTP request.
     """
 
     __attrs__ = [
-        "_content",
-        "status_code",
-        "headers",
-        "url",
-        "history",
-        "encoding",
-        "reason",
-        "cookies",
-        "elapsed",
-        "request",
+        '_content', 'status_code', 'headers', 'url', 'history',
+        'encoding', 'reason', 'cookies', 'elapsed', 'request'
     ]
 
     def __init__(self):
@@ -722,11 +680,11 @@ class Response:
             setattr(self, name, value)
 
         # pickled objects do not have .raw
-        setattr(self, "_content_consumed", True)
-        setattr(self, "raw", None)
+        setattr(self, '_content_consumed', True)
+        setattr(self, 'raw', None)
 
     def __repr__(self):
-        return f"<Response [{self.status_code}]>"
+        return '<Response [%s]>' % (self.status_code)
 
     def __bool__(self):
         """Returns True if :attr:`status_code` is less than 400.
@@ -772,15 +730,12 @@ class Response:
         """True if this Response is a well-formed HTTP redirect that could have
         been processed automatically (by :meth:`Session.resolve_redirects`).
         """
-        return "location" in self.headers and self.status_code in REDIRECT_STATI
+        return ('location' in self.headers and self.status_code in REDIRECT_STATI)
 
     @property
     def is_permanent_redirect(self):
         """True if this Response one of the permanent versions of redirect."""
-        return "location" in self.headers and self.status_code in (
-            codes.moved_permanently,
-            codes.permanent_redirect,
-        )
+        return ('location' in self.headers and self.status_code in (codes.moved_permanently, codes.permanent_redirect))
 
     @property
     def next(self):
@@ -789,8 +744,8 @@ class Response:
 
     @property
     def apparent_encoding(self):
-        """The apparent encoding, provided by the charset_normalizer or chardet libraries."""
-        return chardet.detect(self.content)["encoding"]
+        """The apparent encoding, provided by the chardet library."""
+        return chardet.detect(self.content)['encoding']
 
     def iter_content(self, chunk_size=1, decode_unicode=False):
         """Iterates over the response data.  When stream=True is set on the
@@ -811,17 +766,16 @@ class Response:
 
         def generate():
             # Special case for urllib3.
-            if hasattr(self.raw, "stream"):
+            if hasattr(self.raw, 'stream'):
                 try:
-                    yield from self.raw.stream(chunk_size, decode_content=True)
+                    for chunk in self.raw.stream(chunk_size, decode_content=True):
+                        yield chunk
                 except ProtocolError as e:
                     raise ChunkedEncodingError(e)
                 except DecodeError as e:
                     raise ContentDecodingError(e)
                 except ReadTimeoutError as e:
                     raise ConnectionError(e)
-                except SSLError as e:
-                    raise RequestsSSLError(e)
             else:
                 # Standard file-like object.
                 while True:
@@ -835,9 +789,7 @@ class Response:
         if self._content_consumed and isinstance(self._content, bool):
             raise StreamConsumedError()
         elif chunk_size is not None and not isinstance(chunk_size, int):
-            raise TypeError(
-                f"chunk_size must be an int, it is instead a {type(chunk_size)}."
-            )
+            raise TypeError("chunk_size must be an int, it is instead a %s." % type(chunk_size))
         # simulate reading small chunks of the content
         reused_chunks = iter_slices(self._content, chunk_size)
 
@@ -850,9 +802,7 @@ class Response:
 
         return chunks
 
-    def iter_lines(
-        self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=False, delimiter=None
-    ):
+    def iter_lines(self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=False, delimiter=None):
         """Iterates over the response data, one line at a time.  When
         stream=True is set on the request, this avoids reading the
         content at once into memory for large responses.
@@ -862,9 +812,7 @@ class Response:
 
         pending = None
 
-        for chunk in self.iter_content(
-            chunk_size=chunk_size, decode_unicode=decode_unicode
-        ):
+        for chunk in self.iter_content(chunk_size=chunk_size, decode_unicode=decode_unicode):
 
             if pending is not None:
                 chunk = pending + chunk
@@ -879,7 +827,8 @@ class Response:
             else:
                 pending = None
 
-            yield from lines
+            for line in lines:
+                yield line
 
         if pending is not None:
             yield pending
@@ -891,12 +840,13 @@ class Response:
         if self._content is False:
             # Read the contents.
             if self._content_consumed:
-                raise RuntimeError("The content for this response was already consumed")
+                raise RuntimeError(
+                    'The content for this response was already consumed')
 
             if self.status_code == 0 or self.raw is None:
                 self._content = None
             else:
-                self._content = b"".join(self.iter_content(CONTENT_CHUNK_SIZE)) or b""
+                self._content = b''.join(self.iter_content(CONTENT_CHUNK_SIZE)) or b''
 
         self._content_consumed = True
         # don't need to release the connection; that's been handled by urllib3
@@ -908,7 +858,7 @@ class Response:
         """Content of the response, in unicode.
 
         If Response.encoding is None, encoding will be guessed using
-        ``charset_normalizer`` or ``chardet``.
+        ``chardet``.
 
         The encoding of the response content is determined based solely on HTTP
         headers, following RFC 2616 to the letter. If you can take advantage of
@@ -921,7 +871,7 @@ class Response:
         encoding = self.encoding
 
         if not self.content:
-            return ""
+            return str('')
 
         # Fallback to auto-detected encoding.
         if self.encoding is None:
@@ -929,7 +879,7 @@ class Response:
 
         # Decode unicode from given encoding.
         try:
-            content = str(self.content, encoding, errors="replace")
+            content = str(self.content, encoding, errors='replace')
         except (LookupError, TypeError):
             # A LookupError is raised if the encoding was not found which could
             # indicate a misspelling or similar mistake.
@@ -937,7 +887,7 @@ class Response:
             # A TypeError can be raised if encoding is None
             #
             # So we try blindly encoding.
-            content = str(self.content, errors="replace")
+            content = str(self.content, errors='replace')
 
         return content
 
@@ -945,77 +895,67 @@ class Response:
         r"""Returns the json-encoded content of a response, if any.
 
         :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
-        :raises requests.exceptions.JSONDecodeError: If the response body does not
-            contain valid json.
+        :raises ValueError: If the response body does not contain valid json.
         """
 
         if not self.encoding and self.content and len(self.content) > 3:
             # No encoding set. JSON RFC 4627 section 3 states we should expect
             # UTF-8, -16 or -32. Detect which one to use; If the detection or
-            # decoding fails, fall back to `self.text` (using charset_normalizer to make
+            # decoding fails, fall back to `self.text` (using chardet to make
             # a best guess).
             encoding = guess_json_utf(self.content)
             if encoding is not None:
                 try:
-                    return complexjson.loads(self.content.decode(encoding), **kwargs)
+                    return complexjson.loads(
+                        self.content.decode(encoding), **kwargs
+                    )
                 except UnicodeDecodeError:
                     # Wrong UTF codec detected; usually because it's not UTF-8
                     # but some other 8-bit codec.  This is an RFC violation,
                     # and the server didn't bother to tell us what codec *was*
                     # used.
                     pass
-                except JSONDecodeError as e:
-                    raise RequestsJSONDecodeError(e.msg, e.doc, e.pos)
-
-        try:
-            return complexjson.loads(self.text, **kwargs)
-        except JSONDecodeError as e:
-            # Catch JSON-related errors and raise as requests.JSONDecodeError
-            # This aliases json.JSONDecodeError and simplejson.JSONDecodeError
-            raise RequestsJSONDecodeError(e.msg, e.doc, e.pos)
+        return complexjson.loads(self.text, **kwargs)
 
     @property
     def links(self):
         """Returns the parsed header links of the response, if any."""
 
-        header = self.headers.get("link")
+        header = self.headers.get('link')
 
-        resolved_links = {}
+        # l = MultiDict()
+        l = {}
 
         if header:
             links = parse_header_links(header)
 
             for link in links:
-                key = link.get("rel") or link.get("url")
-                resolved_links[key] = link
+                key = link.get('rel') or link.get('url')
+                l[key] = link
 
-        return resolved_links
+        return l
 
     def raise_for_status(self):
         """Raises :class:`HTTPError`, if one occurred."""
 
-        http_error_msg = ""
+        http_error_msg = ''
         if isinstance(self.reason, bytes):
             # We attempt to decode utf-8 first because some servers
             # choose to localize their reason strings. If the string
             # isn't utf-8, we fall back to iso-8859-1 for all other
             # encodings. (See PR #3538)
             try:
-                reason = self.reason.decode("utf-8")
+                reason = self.reason.decode('utf-8')
             except UnicodeDecodeError:
-                reason = self.reason.decode("iso-8859-1")
+                reason = self.reason.decode('iso-8859-1')
         else:
             reason = self.reason
 
         if 400 <= self.status_code < 500:
-            http_error_msg = (
-                f"{self.status_code} Client Error: {reason} for url: {self.url}"
-            )
+            http_error_msg = u'%s Client Error: %s for url: %s' % (self.status_code, reason, self.url)
 
         elif 500 <= self.status_code < 600:
-            http_error_msg = (
-                f"{self.status_code} Server Error: {reason} for url: {self.url}"
-            )
+            http_error_msg = u'%s Server Error: %s for url: %s' % (self.status_code, reason, self.url)
 
         if http_error_msg:
             raise HTTPError(http_error_msg, response=self)
@@ -1029,6 +969,6 @@ class Response:
         if not self._content_consumed:
             self.raw.close()
 
-        release_conn = getattr(self.raw, "release_conn", None)
+        release_conn = getattr(self.raw, 'release_conn', None)
         if release_conn is not None:
             release_conn()

requests/packages.py

@@ -1,28 +1,14 @@
 import sys
 
-try:
-    import chardet
-except ImportError:
-    import warnings
-
-    import charset_normalizer as chardet
-
-    warnings.filterwarnings("ignore", "Trying to detect", module="charset_normalizer")
-
 # This code exists for backwards compatibility reasons.
 # I don't like it either. Just look the other way. :)
 
-for package in ("urllib3", "idna"):
+for package in ('urllib3', 'idna', 'chardet'):
     locals()[package] = __import__(package)
     # This traversal is apparently necessary such that the identities are
     # preserved (requests.packages.urllib3.* is urllib3.*)
     for mod in list(sys.modules):
-        if mod == package or mod.startswith(f"{package}."):
-            sys.modules[f"requests.packages.{mod}"] = sys.modules[mod]
+        if mod == package or mod.startswith(package + '.'):
+            sys.modules['requests.packages.' + mod] = sys.modules[mod]
 
-target = chardet.__name__
-for mod in list(sys.modules):
-    if mod == target or mod.startswith(f"{target}."):
-        target = target.replace(target, "chardet")
-        sys.modules[f"requests.packages.{target}"] = sys.modules[mod]
 # Kinda cool, though, right?

requests/sessions.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
+
 """
-requests.sessions
-~~~~~~~~~~~~~~~~~
+requests.session
+~~~~~~~~~~~~~~~~
 
 This module provides a Session object to manage and persist settings across
 requests (cookies, auth, proxies).
@@ -8,57 +10,46 @@ requests (cookies, auth, proxies).
 import os
 import sys
 import time
-from collections import OrderedDict
 from datetime import timedelta
+from collections import OrderedDict
 
-from ._internal_utils import to_native_string
-from .adapters import HTTPAdapter
 from .auth import _basic_auth_str
-from .compat import Mapping, cookielib, urljoin, urlparse
+from .compat import cookielib, is_py3, urljoin, urlparse, Mapping
 from .cookies import (
-    RequestsCookieJar,
-    cookiejar_from_dict,
-    extract_cookies_to_jar,
-    merge_cookies,
-)
-from .exceptions import (
-    ChunkedEncodingError,
-    ContentDecodingError,
-    InvalidSchema,
-    TooManyRedirects,
-)
+    cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
+from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
 from .hooks import default_hooks, dispatch_hook
+from ._internal_utils import to_native_string
+from .utils import to_key_val_list, default_headers, DEFAULT_PORTS
+from .exceptions import (
+    TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
+
+from .structures import CaseInsensitiveDict
+from .adapters import HTTPAdapter
+
+from .utils import (
+    requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
+    get_auth_from_url, rewind_body
+)
+
+from .status_codes import codes
 
 # formerly defined here, reexposed here for backward compatibility
-from .models import (  # noqa: F401
-    DEFAULT_REDIRECT_LIMIT,
-    REDIRECT_STATI,
-    PreparedRequest,
-    Request,
-)
-from .status_codes import codes
-from .structures import CaseInsensitiveDict
-from .utils import (  # noqa: F401
-    DEFAULT_PORTS,
-    default_headers,
-    get_auth_from_url,
-    get_environ_proxies,
-    get_netrc_auth,
-    requote_uri,
-    resolve_proxies,
-    rewind_body,
-    should_bypass_proxies,
-    to_key_val_list,
-)
+from .models import REDIRECT_STATI
 
 # Preferred clock, based on which one is more accurate on a given system.
-if sys.platform == "win32":
-    preferred_clock = time.perf_counter
+if sys.platform == 'win32':
+    try:  # Python 3.4+
+        preferred_clock = time.perf_counter
+    except AttributeError:  # Earlier than Python 3.
+        preferred_clock = time.clock
 else:
     preferred_clock = time.time
 
 
-def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
+def merge_setting(
+    request_setting, session_setting, dict_class=OrderedDict, delete_none=True
+):
     """Determines appropriate setting for a given request, taking into account
     the explicit setting on that request, and the setting in the session. If a
     setting is a dictionary, they will be merged together using `dict_class`
@@ -72,18 +63,20 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
 
     # Bypass if not a dictionary (e.g. verify)
     if not (
-        isinstance(session_setting, Mapping) and isinstance(request_setting, Mapping)
+            isinstance(session_setting, Mapping) and
+            isinstance(request_setting, Mapping)
     ):
         return request_setting
 
     merged_setting = dict_class(to_key_val_list(session_setting))
     merged_setting.update(to_key_val_list(request_setting))
 
-    # Remove keys that are set to None. Extract keys first to avoid altering
-    # the dictionary during iteration.
-    none_keys = [k for (k, v) in merged_setting.items() if v is None]
-    for key in none_keys:
-        del merged_setting[key]
+    if delete_none:
+        # Remove keys that are set to None. Extract keys first to avoid altering
+        # the dictionary during iteration.
+        none_keys = [k for (k, v) in merged_setting.items() if v is None]
+        for key in none_keys:
+            del merged_setting[key]
 
     return merged_setting
 
@@ -94,16 +87,17 @@ def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
     This is necessary because when request_hooks == {'response': []}, the
     merge breaks Session hooks entirely.
     """
-    if session_hooks is None or session_hooks.get("response") == []:
+    if session_hooks is None or session_hooks.get('response') == []:
         return request_hooks
 
-    if request_hooks is None or request_hooks.get("response") == []:
+    if request_hooks is None or request_hooks.get('response') == []:
         return session_hooks
 
     return merge_setting(request_hooks, session_hooks, dict_class)
 
 
-class SessionRedirectMixin:
+class SessionRedirectMixin(object):
+
     def get_redirect_target(self, resp):
         """Receives a Response. Returns a redirect URI or ``None``"""
         # Due to the nature of how requests processes redirects this method will
@@ -113,15 +107,16 @@ class SessionRedirectMixin:
         # to cache the redirect location onto the response object as a private
         # attribute.
         if resp.is_redirect:
-            location = resp.headers["location"]
+            location = resp.headers['location']
             # Currently the underlying http module on py3 decode headers
             # in latin1, but empirical evidence suggests that latin1 is very
             # rarely used with non-ASCII characters in HTTP headers.
             # It is more likely to get UTF8 header rather than latin1.
             # This causes incorrect handling of UTF8 encoded location headers.
             # To solve this, we re-encode the location in latin1.
-            location = location.encode("latin1")
-            return to_native_string(location, "utf8")
+            if is_py3:
+                location = location.encode('latin1')
+            return to_native_string(location, 'utf8')
         return None
 
     def should_strip_auth(self, old_url, new_url):
@@ -134,40 +129,23 @@ class SessionRedirectMixin:
         # ports. This isn't specified by RFC 7235, but is kept to avoid
         # breaking backwards compatibility with older versions of requests
         # that allowed any redirects on the same host.
-        if (
-            old_parsed.scheme == "http"
-            and old_parsed.port in (80, None)
-            and new_parsed.scheme == "https"
-            and new_parsed.port in (443, None)
-        ):
+        if (old_parsed.scheme == 'http' and old_parsed.port in (80, None)
+                and new_parsed.scheme == 'https' and new_parsed.port in (443, None)):
             return False
 
         # Handle default port usage corresponding to scheme.
         changed_port = old_parsed.port != new_parsed.port
         changed_scheme = old_parsed.scheme != new_parsed.scheme
         default_port = (DEFAULT_PORTS.get(old_parsed.scheme, None), None)
-        if (
-            not changed_scheme
-            and old_parsed.port in default_port
-            and new_parsed.port in default_port
-        ):
+        if (not changed_scheme and old_parsed.port in default_port
+                and new_parsed.port in default_port):
             return False
 
         # Standard case: root URI must match
         return changed_port or changed_scheme
 
-    def resolve_redirects(
-        self,
-        resp,
-        req,
-        stream=False,
-        timeout=None,
-        verify=True,
-        cert=None,
-        proxies=None,
-        yield_requests=False,
-        **adapter_kwargs,
-    ):
+    def resolve_redirects(self, resp, req, stream=False, timeout=None,
+                          verify=True, cert=None, proxies=None, yield_requests=False, **adapter_kwargs):
         """Receives a Response. Returns a generator of Responses or Requests."""
 
         hist = []  # keep track of history
@@ -188,21 +166,19 @@ class SessionRedirectMixin:
                 resp.raw.read(decode_content=False)
 
             if len(resp.history) >= self.max_redirects:
-                raise TooManyRedirects(
-                    f"Exceeded {self.max_redirects} redirects.", response=resp
-                )
+                raise TooManyRedirects('Exceeded {} redirects.'.format(self.max_redirects), response=resp)
 
             # Release the connection back into the pool.
             resp.close()
 
             # Handle redirection without scheme (see: RFC 1808 Section 4)
-            if url.startswith("//"):
+            if url.startswith('//'):
                 parsed_rurl = urlparse(resp.url)
-                url = ":".join([to_native_string(parsed_rurl.scheme), url])
+                url = ':'.join([to_native_string(parsed_rurl.scheme), url])
 
             # Normalize url case and attach previous fragment if needed (RFC 7231 7.1.2)
             parsed = urlparse(url)
-            if parsed.fragment == "" and previous_fragment:
+            if parsed.fragment == '' and previous_fragment:
                 parsed = parsed._replace(fragment=previous_fragment)
             elif parsed.fragment:
                 previous_fragment = parsed.fragment
@@ -221,18 +197,15 @@ class SessionRedirectMixin:
             self.rebuild_method(prepared_request, resp)
 
             # https://github.com/psf/requests/issues/1084
-            if resp.status_code not in (
-                codes.temporary_redirect,
-                codes.permanent_redirect,
-            ):
+            if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
                 # https://github.com/psf/requests/issues/3490
-                purged_headers = ("Content-Length", "Content-Type", "Transfer-Encoding")
+                purged_headers = ('Content-Length', 'Content-Type', 'Transfer-Encoding')
                 for header in purged_headers:
                     prepared_request.headers.pop(header, None)
                 prepared_request.body = None
 
             headers = prepared_request.headers
-            headers.pop("Cookie", None)
+            headers.pop('Cookie', None)
 
             # Extract any cookies sent on the response to the cookiejar
             # in the new request. Because we've mutated our copied prepared
@@ -248,8 +221,9 @@ class SessionRedirectMixin:
             # A failed tell() sets `_body_position` to `object()`. This non-None
             # value ensures `rewindable` will be True, allowing us to raise an
             # UnrewindableBodyError, instead of hanging the connection.
-            rewindable = prepared_request._body_position is not None and (
-                "Content-Length" in headers or "Transfer-Encoding" in headers
+            rewindable = (
+                prepared_request._body_position is not None and
+                ('Content-Length' in headers or 'Transfer-Encoding' in headers)
             )
 
             # Attempt to rewind consumed file-like object.
@@ -271,7 +245,7 @@ class SessionRedirectMixin:
                     cert=cert,
                     proxies=proxies,
                     allow_redirects=False,
-                    **adapter_kwargs,
+                    **adapter_kwargs
                 )
 
                 extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
@@ -288,18 +262,17 @@ class SessionRedirectMixin:
         headers = prepared_request.headers
         url = prepared_request.url
 
-        if "Authorization" in headers and self.should_strip_auth(
-            response.request.url, url
-        ):
+        if 'Authorization' in headers and self.should_strip_auth(response.request.url, url):
             # If we get redirected to a new host, we should strip out any
             # authentication headers.
-            del headers["Authorization"]
+            del headers['Authorization']
 
         # .netrc might have more auth for us on our new host.
         new_auth = get_netrc_auth(url) if self.trust_env else None
         if new_auth is not None:
             prepared_request.prepare_auth(new_auth)
 
+
     def rebuild_proxies(self, prepared_request, proxies):
         """This method re-evaluates the proxy configuration by considering the
         environment variables. If we are redirected to a URL covered by
@@ -312,12 +285,24 @@ class SessionRedirectMixin:
 
         :rtype: dict
         """
+        proxies = proxies if proxies is not None else {}
         headers = prepared_request.headers
-        scheme = urlparse(prepared_request.url).scheme
-        new_proxies = resolve_proxies(prepared_request, proxies, self.trust_env)
+        url = prepared_request.url
+        scheme = urlparse(url).scheme
+        new_proxies = proxies.copy()
+        no_proxy = proxies.get('no_proxy')
 
-        if "Proxy-Authorization" in headers:
-            del headers["Proxy-Authorization"]
+        bypass_proxy = should_bypass_proxies(url, no_proxy=no_proxy)
+        if self.trust_env and not bypass_proxy:
+            environ_proxies = get_environ_proxies(url, no_proxy=no_proxy)
+
+            proxy = environ_proxies.get(scheme, environ_proxies.get('all'))
+
+            if proxy:
+                new_proxies.setdefault(scheme, proxy)
+
+        if 'Proxy-Authorization' in headers:
+            del headers['Proxy-Authorization']
 
         try:
             username, password = get_auth_from_url(new_proxies[scheme])
@@ -325,7 +310,7 @@ class SessionRedirectMixin:
             username, password = None, None
 
         if username and password:
-            headers["Proxy-Authorization"] = _basic_auth_str(username, password)
+            headers['Proxy-Authorization'] = _basic_auth_str(username, password)
 
         return new_proxies
 
@@ -336,18 +321,18 @@ class SessionRedirectMixin:
         method = prepared_request.method
 
         # https://tools.ietf.org/html/rfc7231#section-6.4.4
-        if response.status_code == codes.see_other and method != "HEAD":
-            method = "GET"
+        if response.status_code == codes.see_other and method != 'HEAD':
+            method = 'GET'
 
         # Do what the browsers do, despite standards...
         # First, turn 302s into GETs.
-        if response.status_code == codes.found and method != "HEAD":
-            method = "GET"
+        if response.status_code == codes.found and method != 'HEAD':
+            method = 'GET'
 
         # Second, if a POST is responded to with a 301, turn it into a GET.
         # This bizarre behaviour is explained in Issue 1704.
-        if response.status_code == codes.moved and method == "POST":
-            method = "GET"
+        if response.status_code == codes.moved and method == 'POST':
+            method = 'GET'
 
         prepared_request.method = method
 
@@ -372,18 +357,9 @@ class Session(SessionRedirectMixin):
     """
 
     __attrs__ = [
-        "headers",
-        "cookies",
-        "auth",
-        "proxies",
-        "hooks",
-        "params",
-        "verify",
-        "cert",
-        "adapters",
-        "stream",
-        "trust_env",
-        "max_redirects",
+        'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
+        'cert', 'adapters', 'stream', 'trust_env',
+        'max_redirects',
     ]
 
     def __init__(self):
@@ -445,8 +421,8 @@ class Session(SessionRedirectMixin):
 
         # Default connection adapters.
         self.adapters = OrderedDict()
-        self.mount("https://", HTTPAdapter())
-        self.mount("http://", HTTPAdapter())
+        self.mount('https://', HTTPAdapter())
+        self.mount('http://', HTTPAdapter())
 
     def __enter__(self):
         return self
@@ -472,8 +448,7 @@ class Session(SessionRedirectMixin):
 
         # Merge with session cookies
         merged_cookies = merge_cookies(
-            merge_cookies(RequestsCookieJar(), self.cookies), cookies
-        )
+            merge_cookies(RequestsCookieJar(), self.cookies), cookies)
 
         # Set environment's basic authentication if not explicitly set.
         auth = request.auth
@@ -488,7 +463,10 @@ class Session(SessionRedirectMixin):
             data=request.data,
             json=request.json,
             headers=merge_setting(
-                request.headers, self.headers, dict_class=CaseInsensitiveDict
+                request.headers,
+                self.headers,
+                dict_class=CaseInsensitiveDict,
+                delete_none=False,
             ),
             params=merge_setting(request.params, self.params),
             auth=merge_setting(auth, self.auth),
@@ -497,25 +475,10 @@ class Session(SessionRedirectMixin):
         )
         return p
 
-    def request(
-        self,
-        method,
-        url,
-        params=None,
-        data=None,
-        headers=None,
-        cookies=None,
-        files=None,
-        auth=None,
-        timeout=None,
-        allow_redirects=True,
-        proxies=None,
-        hooks=None,
-        stream=None,
-        verify=None,
-        cert=None,
-        json=None,
-    ):
+    def request(self, method, url,
+            params=None, data=None, headers=None, cookies=None, files=None,
+            auth=None, timeout=None, allow_redirects=True, proxies=None,
+            hooks=None, stream=None, verify=None, cert=None, json=None):
         """Constructs a :class:`Request <Request>`, prepares it and sends it.
         Returns :class:`Response <Response>` object.
 
@@ -551,7 +514,7 @@ class Session(SessionRedirectMixin):
             ``False``, requests will accept any TLS certificate presented by
             the server, and will ignore hostname mismatches and/or expired
             certificates, which will make your application vulnerable to
-            man-in-the-middle (MitM) attacks. Setting verify to ``False``
+            man-in-the-middle (MitM) attacks. Setting verify to ``False`` 
             may be useful during local development or testing.
         :param cert: (optional) if String, path to ssl client cert file (.pem).
             If Tuple, ('cert', 'key') pair.
@@ -580,8 +543,8 @@ class Session(SessionRedirectMixin):
 
         # Send the request.
         send_kwargs = {
-            "timeout": timeout,
-            "allow_redirects": allow_redirects,
+            'timeout': timeout,
+            'allow_redirects': allow_redirects,
         }
         send_kwargs.update(settings)
         resp = self.send(prep, **send_kwargs)
@@ -596,8 +559,8 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        kwargs.setdefault("allow_redirects", True)
-        return self.request("GET", url, **kwargs)
+        kwargs.setdefault('allow_redirects', True)
+        return self.request('GET', url, **kwargs)
 
     def options(self, url, **kwargs):
         r"""Sends a OPTIONS request. Returns :class:`Response` object.
@@ -607,8 +570,8 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        kwargs.setdefault("allow_redirects", True)
-        return self.request("OPTIONS", url, **kwargs)
+        kwargs.setdefault('allow_redirects', True)
+        return self.request('OPTIONS', url, **kwargs)
 
     def head(self, url, **kwargs):
         r"""Sends a HEAD request. Returns :class:`Response` object.
@@ -618,8 +581,8 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        kwargs.setdefault("allow_redirects", False)
-        return self.request("HEAD", url, **kwargs)
+        kwargs.setdefault('allow_redirects', False)
+        return self.request('HEAD', url, **kwargs)
 
     def post(self, url, data=None, json=None, **kwargs):
         r"""Sends a POST request. Returns :class:`Response` object.
@@ -632,7 +595,7 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        return self.request("POST", url, data=data, json=json, **kwargs)
+        return self.request('POST', url, data=data, json=json, **kwargs)
 
     def put(self, url, data=None, **kwargs):
         r"""Sends a PUT request. Returns :class:`Response` object.
@@ -644,7 +607,7 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        return self.request("PUT", url, data=data, **kwargs)
+        return self.request('PUT', url, data=data, **kwargs)
 
     def patch(self, url, data=None, **kwargs):
         r"""Sends a PATCH request. Returns :class:`Response` object.
@@ -656,7 +619,7 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        return self.request("PATCH", url, data=data, **kwargs)
+        return self.request('PATCH', url, data=data, **kwargs)
 
     def delete(self, url, **kwargs):
         r"""Sends a DELETE request. Returns :class:`Response` object.
@@ -666,7 +629,7 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        return self.request("DELETE", url, **kwargs)
+        return self.request('DELETE', url, **kwargs)
 
     def send(self, request, **kwargs):
         """Send a given PreparedRequest.
@@ -675,20 +638,19 @@ class Session(SessionRedirectMixin):
         """
         # Set defaults that the hooks can utilize to ensure they always have
         # the correct parameters to reproduce the previous request.
-        kwargs.setdefault("stream", self.stream)
-        kwargs.setdefault("verify", self.verify)
-        kwargs.setdefault("cert", self.cert)
-        if "proxies" not in kwargs:
-            kwargs["proxies"] = resolve_proxies(request, self.proxies, self.trust_env)
+        kwargs.setdefault('stream', self.stream)
+        kwargs.setdefault('verify', self.verify)
+        kwargs.setdefault('cert', self.cert)
+        kwargs.setdefault('proxies', self.proxies)
 
         # It's possible that users might accidentally send a Request object.
         # Guard against that specific failure case.
         if isinstance(request, Request):
-            raise ValueError("You can only send PreparedRequests.")
+            raise ValueError('You can only send PreparedRequests.')
 
         # Set up variables needed for resolve_redirects and dispatching of hooks
-        allow_redirects = kwargs.pop("allow_redirects", True)
-        stream = kwargs.get("stream")
+        allow_redirects = kwargs.pop('allow_redirects', True)
+        stream = kwargs.get('stream')
         hooks = request.hooks
 
         # Get the appropriate adapter to use
@@ -705,7 +667,7 @@ class Session(SessionRedirectMixin):
         r.elapsed = timedelta(seconds=elapsed)
 
         # Response manipulation hooks
-        r = dispatch_hook("response", hooks, r, **kwargs)
+        r = dispatch_hook('response', hooks, r, **kwargs)
 
         # Persist cookies
         if r.history:
@@ -735,9 +697,7 @@ class Session(SessionRedirectMixin):
         # If redirects aren't being followed, store the response on the Request for Response.next().
         if not allow_redirects:
             try:
-                r._next = next(
-                    self.resolve_redirects(r, request, yield_requests=True, **kwargs)
-                )
+                r._next = next(self.resolve_redirects(r, request, yield_requests=True, **kwargs))
             except StopIteration:
                 pass
 
@@ -755,19 +715,16 @@ class Session(SessionRedirectMixin):
         # Gather clues from the surrounding environment.
         if self.trust_env:
             # Set environment's proxies.
-            no_proxy = proxies.get("no_proxy") if proxies is not None else None
+            no_proxy = proxies.get('no_proxy') if proxies is not None else None
             env_proxies = get_environ_proxies(url, no_proxy=no_proxy)
             for (k, v) in env_proxies.items():
                 proxies.setdefault(k, v)
 
-            # Look for requests environment configuration
-            # and be compatible with cURL.
+            # Look for requests environment configuration and be compatible
+            # with cURL.
             if verify is True or verify is None:
-                verify = (
-                    os.environ.get("REQUESTS_CA_BUNDLE")
-                    or os.environ.get("CURL_CA_BUNDLE")
-                    or verify
-                )
+                verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
+                          os.environ.get('CURL_CA_BUNDLE'))
 
         # Merge all the kwargs.
         proxies = merge_setting(proxies, self.proxies)
@@ -775,7 +732,8 @@ class Session(SessionRedirectMixin):
         verify = merge_setting(verify, self.verify)
         cert = merge_setting(cert, self.cert)
 
-        return {"proxies": proxies, "stream": stream, "verify": verify, "cert": cert}
+        return {'verify': verify, 'proxies': proxies, 'stream': stream,
+                'cert': cert}
 
     def get_adapter(self, url):
         """
@@ -789,7 +747,7 @@ class Session(SessionRedirectMixin):
                 return adapter
 
         # Nothing matches :-/
-        raise InvalidSchema(f"No connection adapters were found for {url!r}")
+        raise InvalidSchema("No connection adapters were found for {!r}".format(url))
 
     def close(self):
         """Closes all adapters and as such the session"""

requests/status_codes.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 r"""
 The ``codes`` object defines a mapping from common names for HTTP statuses
 to their numerical codes, accessible either as attributes or as dictionary
@@ -21,108 +23,101 @@ the names are allowed. For example, ``codes.ok``, ``codes.OK``, and
 from .structures import LookupDict
 
 _codes = {
+
     # Informational.
-    100: ("continue",),
-    101: ("switching_protocols",),
-    102: ("processing",),
-    103: ("checkpoint",),
-    122: ("uri_too_long", "request_uri_too_long"),
-    200: ("ok", "okay", "all_ok", "all_okay", "all_good", "\\o/", "✓"),
-    201: ("created",),
-    202: ("accepted",),
-    203: ("non_authoritative_info", "non_authoritative_information"),
-    204: ("no_content",),
-    205: ("reset_content", "reset"),
-    206: ("partial_content", "partial"),
-    207: ("multi_status", "multiple_status", "multi_stati", "multiple_stati"),
-    208: ("already_reported",),
-    226: ("im_used",),
+    100: ('continue',),
+    101: ('switching_protocols',),
+    102: ('processing',),
+    103: ('checkpoint',),
+    122: ('uri_too_long', 'request_uri_too_long'),
+    200: ('ok', 'okay', 'all_ok', 'all_okay', 'all_good', '\\o/', '✓'),
+    201: ('created',),
+    202: ('accepted',),
+    203: ('non_authoritative_info', 'non_authoritative_information'),
+    204: ('no_content',),
+    205: ('reset_content', 'reset'),
+    206: ('partial_content', 'partial'),
+    207: ('multi_status', 'multiple_status', 'multi_stati', 'multiple_stati'),
+    208: ('already_reported',),
+    226: ('im_used',),
+
     # Redirection.
-    300: ("multiple_choices",),
-    301: ("moved_permanently", "moved", "\\o-"),
-    302: ("found",),
-    303: ("see_other", "other"),
-    304: ("not_modified",),
-    305: ("use_proxy",),
-    306: ("switch_proxy",),
-    307: ("temporary_redirect", "temporary_moved", "temporary"),
-    308: (
-        "permanent_redirect",
-        "resume_incomplete",
-        "resume",
-    ),  # "resume" and "resume_incomplete" to be removed in 3.0
+    300: ('multiple_choices',),
+    301: ('moved_permanently', 'moved', '\\o-'),
+    302: ('found',),
+    303: ('see_other', 'other'),
+    304: ('not_modified',),
+    305: ('use_proxy',),
+    306: ('switch_proxy',),
+    307: ('temporary_redirect', 'temporary_moved', 'temporary'),
+    308: ('permanent_redirect',
+          'resume_incomplete', 'resume',),  # These 2 to be removed in 3.0
+
     # Client Error.
-    400: ("bad_request", "bad"),
-    401: ("unauthorized",),
-    402: ("payment_required", "payment"),
-    403: ("forbidden",),
-    404: ("not_found", "-o-"),
-    405: ("method_not_allowed", "not_allowed"),
-    406: ("not_acceptable",),
-    407: ("proxy_authentication_required", "proxy_auth", "proxy_authentication"),
-    408: ("request_timeout", "timeout"),
-    409: ("conflict",),
-    410: ("gone",),
-    411: ("length_required",),
-    412: ("precondition_failed", "precondition"),
-    413: ("request_entity_too_large",),
-    414: ("request_uri_too_large",),
-    415: ("unsupported_media_type", "unsupported_media", "media_type"),
-    416: (
-        "requested_range_not_satisfiable",
-        "requested_range",
-        "range_not_satisfiable",
-    ),
-    417: ("expectation_failed",),
-    418: ("im_a_teapot", "teapot", "i_am_a_teapot"),
-    421: ("misdirected_request",),
-    422: ("unprocessable_entity", "unprocessable"),
-    423: ("locked",),
-    424: ("failed_dependency", "dependency"),
-    425: ("unordered_collection", "unordered"),
-    426: ("upgrade_required", "upgrade"),
-    428: ("precondition_required", "precondition"),
-    429: ("too_many_requests", "too_many"),
-    431: ("header_fields_too_large", "fields_too_large"),
-    444: ("no_response", "none"),
-    449: ("retry_with", "retry"),
-    450: ("blocked_by_windows_parental_controls", "parental_controls"),
-    451: ("unavailable_for_legal_reasons", "legal_reasons"),
-    499: ("client_closed_request",),
+    400: ('bad_request', 'bad'),
+    401: ('unauthorized',),
+    402: ('payment_required', 'payment'),
+    403: ('forbidden',),
+    404: ('not_found', '-o-'),
+    405: ('method_not_allowed', 'not_allowed'),
+    406: ('not_acceptable',),
+    407: ('proxy_authentication_required', 'proxy_auth', 'proxy_authentication'),
+    408: ('request_timeout', 'timeout'),
+    409: ('conflict',),
+    410: ('gone',),
+    411: ('length_required',),
+    412: ('precondition_failed', 'precondition'),
+    413: ('request_entity_too_large',),
+    414: ('request_uri_too_large',),
+    415: ('unsupported_media_type', 'unsupported_media', 'media_type'),
+    416: ('requested_range_not_satisfiable', 'requested_range', 'range_not_satisfiable'),
+    417: ('expectation_failed',),
+    418: ('im_a_teapot', 'teapot', 'i_am_a_teapot'),
+    421: ('misdirected_request',),
+    422: ('unprocessable_entity', 'unprocessable'),
+    423: ('locked',),
+    424: ('failed_dependency', 'dependency'),
+    425: ('unordered_collection', 'unordered'),
+    426: ('upgrade_required', 'upgrade'),
+    428: ('precondition_required', 'precondition'),
+    429: ('too_many_requests', 'too_many'),
+    431: ('header_fields_too_large', 'fields_too_large'),
+    444: ('no_response', 'none'),
+    449: ('retry_with', 'retry'),
+    450: ('blocked_by_windows_parental_controls', 'parental_controls'),
+    451: ('unavailable_for_legal_reasons', 'legal_reasons'),
+    499: ('client_closed_request',),
+
     # Server Error.
-    500: ("internal_server_error", "server_error", "/o\\", "✗"),
-    501: ("not_implemented",),
-    502: ("bad_gateway",),
-    503: ("service_unavailable", "unavailable"),
-    504: ("gateway_timeout",),
-    505: ("http_version_not_supported", "http_version"),
-    506: ("variant_also_negotiates",),
-    507: ("insufficient_storage",),
-    509: ("bandwidth_limit_exceeded", "bandwidth"),
-    510: ("not_extended",),
-    511: ("network_authentication_required", "network_auth", "network_authentication"),
+    500: ('internal_server_error', 'server_error', '/o\\', '✗'),
+    501: ('not_implemented',),
+    502: ('bad_gateway',),
+    503: ('service_unavailable', 'unavailable'),
+    504: ('gateway_timeout',),
+    505: ('http_version_not_supported', 'http_version'),
+    506: ('variant_also_negotiates',),
+    507: ('insufficient_storage',),
+    509: ('bandwidth_limit_exceeded', 'bandwidth'),
+    510: ('not_extended',),
+    511: ('network_authentication_required', 'network_auth', 'network_authentication'),
 }
 
-codes = LookupDict(name="status_codes")
-
+codes = LookupDict(name='status_codes')
 
 def _init():
     for code, titles in _codes.items():
         for title in titles:
             setattr(codes, title, code)
-            if not title.startswith(("\\", "/")):
+            if not title.startswith(('\\', '/')):
                 setattr(codes, title.upper(), code)
 
     def doc(code):
-        names = ", ".join(f"``{n}``" for n in _codes[code])
-        return "* %d: %s" % (code, names)
+        names = ', '.join('``%s``' % n for n in _codes[code])
+        return '* %d: %s' % (code, names)
 
     global __doc__
-    __doc__ = (
-        __doc__ + "\n" + "\n".join(doc(code) for code in sorted(_codes))
-        if __doc__ is not None
-        else None
-    )
-
+    __doc__ = (__doc__ + '\n' +
+               '\n'.join(doc(code) for code in sorted(_codes))
+               if __doc__ is not None else None)
 
 _init()

requests/structures.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.structures
 ~~~~~~~~~~~~~~~~~~~
@@ -62,7 +64,11 @@ class CaseInsensitiveDict(MutableMapping):
 
     def lower_items(self):
         """Like iteritems(), but with all lowercase keys."""
-        return ((lowerkey, keyval[1]) for (lowerkey, keyval) in self._store.items())
+        return (
+            (lowerkey, keyval[1])
+            for (lowerkey, keyval)
+            in self._store.items()
+        )
 
     def __eq__(self, other):
         if isinstance(other, Mapping):
@@ -85,10 +91,10 @@ class LookupDict(dict):
 
     def __init__(self, name=None):
         self.name = name
-        super().__init__()
+        super(LookupDict, self).__init__()
 
     def __repr__(self):
-        return f"<lookup '{self.name}'>"
+        return '<lookup \'%s\'>' % (self.name)
 
     def __getitem__(self, key):
         # We allow fall-through here, so values default to None

requests/utils.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.utils
 ~~~~~~~~~~~~~~
@@ -19,71 +21,49 @@ import warnings
 import zipfile
 from collections import OrderedDict
 
-from urllib3.util import make_headers, parse_url
-
-from . import certs
 from .__version__ import __version__
-
+from . import certs
 # to_native_string is unused here, but imported here for backwards compatibility
-from ._internal_utils import HEADER_VALIDATORS, to_native_string  # noqa: F401
-from .compat import (
-    Mapping,
-    basestring,
-    bytes,
-    getproxies,
-    getproxies_environment,
-    integer_types,
-)
+from ._internal_utils import to_native_string
 from .compat import parse_http_list as _parse_list_header
 from .compat import (
-    proxy_bypass,
-    proxy_bypass_environment,
-    quote,
-    str,
-    unquote,
-    urlparse,
-    urlunparse,
-)
+    quote, urlparse, bytes, str, unquote, getproxies,
+    proxy_bypass, urlunparse, basestring, integer_types, is_py3,
+    proxy_bypass_environment, getproxies_environment, Mapping)
 from .cookies import cookiejar_from_dict
-from .exceptions import (
-    FileModeWarning,
-    InvalidHeader,
-    InvalidURL,
-    UnrewindableBodyError,
-)
 from .structures import CaseInsensitiveDict
+from .exceptions import (
+    InvalidURL, InvalidHeader, FileModeWarning, UnrewindableBodyError)
 
-NETRC_FILES = (".netrc", "_netrc")
+NETRC_FILES = ('.netrc', '_netrc')
 
 DEFAULT_CA_BUNDLE_PATH = certs.where()
 
-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"])
-)
+DEFAULT_PORTS = {'http': 80, 'https': 443}
 
 
-if sys.platform == "win32":
+if sys.platform == 'win32':
     # provide a proxy_bypass version on Windows without DNS lookups
 
     def proxy_bypass_registry(host):
         try:
-            import winreg
+            if is_py3:
+                import winreg
+            else:
+                import _winreg as winreg
         except ImportError:
             return False
 
         try:
-            internetSettings = winreg.OpenKey(
-                winreg.HKEY_CURRENT_USER,
-                r"Software\Microsoft\Windows\CurrentVersion\Internet Settings",
-            )
+            internetSettings = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
+                r'Software\Microsoft\Windows\CurrentVersion\Internet Settings')
             # ProxyEnable could be REG_SZ or REG_DWORD, normalizing it
-            proxyEnable = int(winreg.QueryValueEx(internetSettings, "ProxyEnable")[0])
+            proxyEnable = int(winreg.QueryValueEx(internetSettings,
+                                              'ProxyEnable')[0])
             # ProxyOverride is almost always a string
-            proxyOverride = winreg.QueryValueEx(internetSettings, "ProxyOverride")[0]
-        except (OSError, ValueError):
+            proxyOverride = winreg.QueryValueEx(internetSettings,
+                                                'ProxyOverride')[0]
+        except OSError:
             return False
         if not proxyEnable or not proxyOverride:
             return False
@@ -91,15 +71,15 @@ if sys.platform == "win32":
         # make a check value list from the registry entry: replace the
         # '<local>' string by the localhost entry and the corresponding
         # canonical entry.
-        proxyOverride = proxyOverride.split(";")
+        proxyOverride = proxyOverride.split(';')
         # now check if we match one of the registry values.
         for test in proxyOverride:
-            if test == "<local>":
-                if "." not in host:
+            if test == '<local>':
+                if '.' not in host:
                     return True
-            test = test.replace(".", r"\.")  # mask dots
-            test = test.replace("*", r".*")  # change glob sequence
-            test = test.replace("?", r".")  # change glob char
+            test = test.replace(".", r"\.")     # mask dots
+            test = test.replace("*", r".*")     # change glob sequence
+            test = test.replace("?", r".")      # change glob char
             if re.match(test, host, re.I):
                 return True
         return False
@@ -119,7 +99,7 @@ if sys.platform == "win32":
 def dict_to_sequence(d):
     """Returns an internal sequence dictionary update."""
 
-    if hasattr(d, "items"):
+    if hasattr(d, 'items'):
         d = d.items()
 
     return d
@@ -129,42 +109,37 @@ def super_len(o):
     total_length = None
     current_position = 0
 
-    if hasattr(o, "__len__"):
+    if hasattr(o, '__len__'):
         total_length = len(o)
 
-    elif hasattr(o, "len"):
+    elif hasattr(o, 'len'):
         total_length = o.len
 
-    elif hasattr(o, "fileno"):
+    elif hasattr(o, 'fileno'):
         try:
             fileno = o.fileno()
-        except (io.UnsupportedOperation, AttributeError):
-            # AttributeError is a surprising exception, seeing as how we've just checked
-            # that `hasattr(o, 'fileno')`.  It happens for objects obtained via
-            # `Tarfile.extractfile()`, per issue 5229.
+        except io.UnsupportedOperation:
             pass
         else:
             total_length = os.fstat(fileno).st_size
 
             # Having used fstat to determine the file length, we need to
             # confirm that this file was opened up in binary mode.
-            if "b" not in o.mode:
-                warnings.warn(
-                    (
-                        "Requests has determined the content-length for this "
-                        "request using the binary size of the file: however, the "
-                        "file has been opened in text mode (i.e. without the 'b' "
-                        "flag in the mode). This may lead to an incorrect "
-                        "content-length. In Requests 3.0, support will be removed "
-                        "for files in text mode."
-                    ),
-                    FileModeWarning,
+            if 'b' not in o.mode:
+                warnings.warn((
+                    "Requests has determined the content-length for this "
+                    "request using the binary size of the file: however, the "
+                    "file has been opened in text mode (i.e. without the 'b' "
+                    "flag in the mode). This may lead to an incorrect "
+                    "content-length. In Requests 3.0, support will be removed "
+                    "for files in text mode."),
+                    FileModeWarning
                 )
 
-    if hasattr(o, "tell"):
+    if hasattr(o, 'tell'):
         try:
             current_position = o.tell()
-        except OSError:
+        except (OSError, IOError):
             # This can happen in some weird situations, such as when the file
             # is actually a special file descriptor like stdin. In this
             # instance, we don't know what the length is, so set it to zero and
@@ -172,8 +147,8 @@ def super_len(o):
             if total_length is not None:
                 current_position = total_length
         else:
-            if hasattr(o, "seek") and total_length is None:
-                # StringIO and BytesIO have seek but no usable fileno
+            if hasattr(o, 'seek') and total_length is None:
+                # StringIO and BytesIO have seek but no useable fileno
                 try:
                     # seek to end of file
                     o.seek(0, 2)
@@ -182,7 +157,7 @@ def super_len(o):
                     # seek back to current position to support
                     # partially read file-like objects
                     o.seek(current_position or 0)
-                except OSError:
+                except (OSError, IOError):
                     total_length = 0
 
     if total_length is None:
@@ -194,14 +169,14 @@ def super_len(o):
 def get_netrc_auth(url, raise_errors=False):
     """Returns the Requests tuple auth for a given url from netrc."""
 
-    netrc_file = os.environ.get("NETRC")
+    netrc_file = os.environ.get('NETRC')
     if netrc_file is not None:
         netrc_locations = (netrc_file,)
     else:
-        netrc_locations = (f"~/{f}" for f in NETRC_FILES)
+        netrc_locations = ('~/{}'.format(f) for f in NETRC_FILES)
 
     try:
-        from netrc import NetrcParseError, netrc
+        from netrc import netrc, NetrcParseError
 
         netrc_path = None
 
@@ -226,18 +201,18 @@ def get_netrc_auth(url, raise_errors=False):
 
         # Strip port numbers from netloc. This weird `if...encode`` dance is
         # used for Python 3.2, which doesn't support unicode literals.
-        splitstr = b":"
+        splitstr = b':'
         if isinstance(url, str):
-            splitstr = splitstr.decode("ascii")
+            splitstr = splitstr.decode('ascii')
         host = ri.netloc.split(splitstr)[0]
 
         try:
             _netrc = netrc(netrc_path).authenticators(host)
             if _netrc:
                 # Return with login / password
-                login_i = 0 if _netrc[0] else 1
+                login_i = (0 if _netrc[0] else 1)
                 return (_netrc[login_i], _netrc[2])
-        except (NetrcParseError, OSError):
+        except (NetrcParseError, IOError):
             # If there was a parsing error or a permissions issue reading the file,
             # we'll just skip netrc auth unless explicitly asked to raise errors.
             if raise_errors:
@@ -250,8 +225,9 @@ def get_netrc_auth(url, raise_errors=False):
 
 def guess_filename(obj):
     """Tries to guess the filename of the given object."""
-    name = getattr(obj, "name", None)
-    if name and isinstance(name, basestring) and name[0] != "<" and name[-1] != ">":
+    name = getattr(obj, 'name', None)
+    if (name and isinstance(name, basestring) and name[0] != '<' and
+            name[-1] != '>'):
         return os.path.basename(name)
 
 
@@ -269,11 +245,7 @@ def extract_zipped_paths(path):
     archive, member = os.path.split(path)
     while archive and not os.path.exists(archive):
         archive, prefix = os.path.split(archive)
-        if not prefix:
-            # If we don't check for an empty prefix after the split (in other words, archive remains unchanged after the split),
-            # we _can_ end up in an infinite loop on a rare corner case affecting a small number of users
-            break
-        member = "/".join([prefix, member])
+        member = '/'.join([prefix, member])
 
     if not zipfile.is_zipfile(archive):
         return path
@@ -284,27 +256,13 @@ def extract_zipped_paths(path):
 
     # we have a valid zip archive and a valid member of that archive
     tmp = tempfile.gettempdir()
-    extracted_path = os.path.join(tmp, member.split("/")[-1])
+    extracted_path = os.path.join(tmp, *member.split('/'))
     if not os.path.exists(extracted_path):
-        # use read + write to avoid the creating nested folders, we only want the file, avoids mkdir racing condition
-        with atomic_open(extracted_path) as file_handler:
-            file_handler.write(zip_file.read(member))
+        extracted_path = zip_file.extract(member, path=tmp)
+
     return extracted_path
 
 
-@contextlib.contextmanager
-def atomic_open(filename):
-    """Write a file to the disk in an atomic fashion"""
-    tmp_descriptor, tmp_name = tempfile.mkstemp(dir=os.path.dirname(filename))
-    try:
-        with os.fdopen(tmp_descriptor, "wb") as tmp_handler:
-            yield tmp_handler
-        os.replace(tmp_name, filename)
-    except BaseException:
-        os.remove(tmp_name)
-        raise
-
-
 def from_key_val_list(value):
     """Take an object and test to see if it can be represented as a
     dictionary. Unless it can not be represented as such, return an
@@ -327,7 +285,7 @@ def from_key_val_list(value):
         return None
 
     if isinstance(value, (str, bytes, bool, int)):
-        raise ValueError("cannot encode objects that are not 2-tuples")
+        raise ValueError('cannot encode objects that are not 2-tuples')
 
     return OrderedDict(value)
 
@@ -353,7 +311,7 @@ def to_key_val_list(value):
         return None
 
     if isinstance(value, (str, bytes, bool, int)):
-        raise ValueError("cannot encode objects that are not 2-tuples")
+        raise ValueError('cannot encode objects that are not 2-tuples')
 
     if isinstance(value, Mapping):
         value = value.items()
@@ -418,10 +376,10 @@ def parse_dict_header(value):
     """
     result = {}
     for item in _parse_list_header(value):
-        if "=" not in item:
+        if '=' not in item:
             result[item] = None
             continue
-        name, value = item.split("=", 1)
+        name, value = item.split('=', 1)
         if value[:1] == value[-1:] == '"':
             value = unquote_header_value(value[1:-1])
         result[name] = value
@@ -449,8 +407,8 @@ def unquote_header_value(value, is_filename=False):
         # replace sequence below on a UNC path has the effect of turning
         # the leading double slash into a single slash and then
         # _fix_ie_filename() doesn't work correctly.  See #458.
-        if not is_filename or value[:2] != "\\\\":
-            return value.replace("\\\\", "\\").replace('\\"', '"')
+        if not is_filename or value[:2] != '\\\\':
+            return value.replace('\\\\', '\\').replace('\\"', '"')
     return value
 
 
@@ -485,24 +443,19 @@ def get_encodings_from_content(content):
 
     :param content: bytestring to extract encodings from.
     """
-    warnings.warn(
-        (
-            "In requests 3.0, get_encodings_from_content will be removed. For "
-            "more information, please see the discussion on issue #2266. (This"
-            " warning should only appear once.)"
-        ),
-        DeprecationWarning,
-    )
+    warnings.warn((
+        'In requests 3.0, get_encodings_from_content will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
 
     charset_re = re.compile(r'<meta.*?charset=["\']*(.+?)["\'>]', flags=re.I)
     pragma_re = re.compile(r'<meta.*?content=["\']*;?charset=(.+?)["\'>]', flags=re.I)
     xml_re = re.compile(r'^<\?xml.*?encoding=["\']*(.+?)["\'>]')
 
-    return (
-        charset_re.findall(content)
-        + pragma_re.findall(content)
-        + xml_re.findall(content)
-    )
+    return (charset_re.findall(content) +
+            pragma_re.findall(content) +
+            xml_re.findall(content))
 
 
 def _parse_content_type_header(header):
@@ -513,7 +466,7 @@ def _parse_content_type_header(header):
          parameters
     """
 
-    tokens = header.split(";")
+    tokens = header.split(';')
     content_type, params = tokens[0].strip(), tokens[1:]
     params_dict = {}
     items_to_strip = "\"' "
@@ -525,7 +478,7 @@ def _parse_content_type_header(header):
             index_of_equals = param.find("=")
             if index_of_equals != -1:
                 key = param[:index_of_equals].strip(items_to_strip)
-                value = param[index_of_equals + 1 :].strip(items_to_strip)
+                value = param[index_of_equals + 1:].strip(items_to_strip)
             params_dict[key.lower()] = value
     return content_type, params_dict
 
@@ -537,37 +490,38 @@ def get_encoding_from_headers(headers):
     :rtype: str
     """
 
-    content_type = headers.get("content-type")
+    content_type = headers.get('content-type')
 
     if not content_type:
         return None
 
     content_type, params = _parse_content_type_header(content_type)
 
-    if "charset" in params:
-        return params["charset"].strip("'\"")
+    if 'charset' in params:
+        return params['charset'].strip("'\"")
 
-    if "text" in content_type:
-        return "ISO-8859-1"
+    if 'text' in content_type:
+        return 'ISO-8859-1'
 
-    if "application/json" in content_type:
+    if 'application/json' in content_type:
         # Assume UTF-8 based on RFC 4627: https://www.ietf.org/rfc/rfc4627.txt since the charset was unset
-        return "utf-8"
+        return 'utf-8'
 
 
 def stream_decode_response_unicode(iterator, r):
-    """Stream decodes an iterator."""
+    """Stream decodes a iterator."""
 
     if r.encoding is None:
-        yield from iterator
+        for item in iterator:
+            yield item
         return
 
-    decoder = codecs.getincrementaldecoder(r.encoding)(errors="replace")
+    decoder = codecs.getincrementaldecoder(r.encoding)(errors='replace')
     for chunk in iterator:
         rv = decoder.decode(chunk)
         if rv:
             yield rv
-    rv = decoder.decode(b"", final=True)
+    rv = decoder.decode(b'', final=True)
     if rv:
         yield rv
 
@@ -578,7 +532,7 @@ def iter_slices(string, slice_length):
     if slice_length is None or slice_length <= 0:
         slice_length = len(string)
     while pos < len(string):
-        yield string[pos : pos + slice_length]
+        yield string[pos:pos + slice_length]
         pos += slice_length
 
 
@@ -594,14 +548,11 @@ def get_unicode_from_response(r):
 
     :rtype: str
     """
-    warnings.warn(
-        (
-            "In requests 3.0, get_unicode_from_response will be removed. For "
-            "more information, please see the discussion on issue #2266. (This"
-            " warning should only appear once.)"
-        ),
-        DeprecationWarning,
-    )
+    warnings.warn((
+        'In requests 3.0, get_unicode_from_response will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
 
     tried_encodings = []
 
@@ -616,15 +567,14 @@ def get_unicode_from_response(r):
 
     # Fall back:
     try:
-        return str(r.content, encoding, errors="replace")
+        return str(r.content, encoding, errors='replace')
     except TypeError:
         return r.content
 
 
 # The unreserved URI characters (RFC 3986)
 UNRESERVED_SET = frozenset(
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789-._~"
-)
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789-._~")
 
 
 def unquote_unreserved(uri):
@@ -633,22 +583,22 @@ def unquote_unreserved(uri):
 
     :rtype: str
     """
-    parts = uri.split("%")
+    parts = uri.split('%')
     for i in range(1, len(parts)):
         h = parts[i][0:2]
         if len(h) == 2 and h.isalnum():
             try:
                 c = chr(int(h, 16))
             except ValueError:
-                raise InvalidURL(f"Invalid percent-escape sequence: '{h}'")
+                raise InvalidURL("Invalid percent-escape sequence: '%s'" % h)
 
             if c in UNRESERVED_SET:
                 parts[i] = c + parts[i][2:]
             else:
-                parts[i] = f"%{parts[i]}"
+                parts[i] = '%' + parts[i]
         else:
-            parts[i] = f"%{parts[i]}"
-    return "".join(parts)
+            parts[i] = '%' + parts[i]
+    return ''.join(parts)
 
 
 def requote_uri(uri):
@@ -681,10 +631,10 @@ def address_in_network(ip, net):
 
     :rtype: bool
     """
-    ipaddr = struct.unpack("=L", socket.inet_aton(ip))[0]
-    netaddr, bits = net.split("/")
-    netmask = struct.unpack("=L", socket.inet_aton(dotted_netmask(int(bits))))[0]
-    network = struct.unpack("=L", socket.inet_aton(netaddr))[0] & netmask
+    ipaddr = struct.unpack('=L', socket.inet_aton(ip))[0]
+    netaddr, bits = net.split('/')
+    netmask = struct.unpack('=L', socket.inet_aton(dotted_netmask(int(bits))))[0]
+    network = struct.unpack('=L', socket.inet_aton(netaddr))[0] & netmask
     return (ipaddr & netmask) == (network & netmask)
 
 
@@ -695,8 +645,8 @@ def dotted_netmask(mask):
 
     :rtype: str
     """
-    bits = 0xFFFFFFFF ^ (1 << 32 - mask) - 1
-    return socket.inet_ntoa(struct.pack(">I", bits))
+    bits = 0xffffffff ^ (1 << 32 - mask) - 1
+    return socket.inet_ntoa(struct.pack('>I', bits))
 
 
 def is_ipv4_address(string_ip):
@@ -705,7 +655,7 @@ def is_ipv4_address(string_ip):
     """
     try:
         socket.inet_aton(string_ip)
-    except OSError:
+    except socket.error:
         return False
     return True
 
@@ -716,9 +666,9 @@ def is_valid_cidr(string_network):
 
     :rtype: bool
     """
-    if string_network.count("/") == 1:
+    if string_network.count('/') == 1:
         try:
-            mask = int(string_network.split("/")[1])
+            mask = int(string_network.split('/')[1])
         except ValueError:
             return False
 
@@ -726,8 +676,8 @@ def is_valid_cidr(string_network):
             return False
 
         try:
-            socket.inet_aton(string_network.split("/")[0])
-        except OSError:
+            socket.inet_aton(string_network.split('/')[0])
+        except socket.error:
             return False
     else:
         return False
@@ -764,14 +714,13 @@ def should_bypass_proxies(url, no_proxy):
     """
     # Prioritize lowercase environment variables over uppercase
     # to keep a consistent behaviour with other http projects (curl, wget).
-    def get_proxy(key):
-        return os.environ.get(key) or os.environ.get(key.upper())
+    get_proxy = lambda k: os.environ.get(k) or os.environ.get(k.upper())
 
     # First check whether no_proxy is defined. If it is, check that the URL
     # we're getting isn't in the no_proxy list.
     no_proxy_arg = no_proxy
     if no_proxy is None:
-        no_proxy = get_proxy("no_proxy")
+        no_proxy = get_proxy('no_proxy')
     parsed = urlparse(url)
 
     if parsed.hostname is None:
@@ -781,7 +730,9 @@ def should_bypass_proxies(url, no_proxy):
     if no_proxy:
         # We need to check whether we match here. We need to see if we match
         # the end of the hostname, both with and without the port.
-        no_proxy = (host for host in no_proxy.replace(" ", "").split(",") if host)
+        no_proxy = (
+            host for host in no_proxy.replace(' ', '').split(',') if host
+        )
 
         if is_ipv4_address(parsed.hostname):
             for proxy_ip in no_proxy:
@@ -795,7 +746,7 @@ def should_bypass_proxies(url, no_proxy):
         else:
             host_with_port = parsed.hostname
             if parsed.port:
-                host_with_port += f":{parsed.port}"
+                host_with_port += ':{}'.format(parsed.port)
 
             for host in no_proxy:
                 if parsed.hostname.endswith(host) or host_with_port.endswith(host):
@@ -803,7 +754,7 @@ def should_bypass_proxies(url, no_proxy):
                     # to apply the proxies on this URL.
                     return True
 
-    with set_environ("no_proxy", no_proxy_arg):
+    with set_environ('no_proxy', no_proxy_arg):
         # parsed.hostname can be `None` in cases such as a file URI.
         try:
             bypass = proxy_bypass(parsed.hostname)
@@ -837,13 +788,13 @@ def select_proxy(url, proxies):
     proxies = proxies or {}
     urlparts = urlparse(url)
     if urlparts.hostname is None:
-        return proxies.get(urlparts.scheme, proxies.get("all"))
+        return proxies.get(urlparts.scheme, proxies.get('all'))
 
     proxy_keys = [
-        urlparts.scheme + "://" + urlparts.hostname,
+        urlparts.scheme + '://' + urlparts.hostname,
         urlparts.scheme,
-        "all://" + urlparts.hostname,
-        "all",
+        'all://' + urlparts.hostname,
+        'all',
     ]
     proxy = None
     for proxy_key in proxy_keys:
@@ -854,54 +805,25 @@ def select_proxy(url, proxies):
     return proxy
 
 
-def resolve_proxies(request, proxies, trust_env=True):
-    """This method takes proxy information from a request and configuration
-    input to resolve a mapping of target proxies. This will consider settings
-    such a NO_PROXY to strip proxy configurations.
-
-    :param request: Request or PreparedRequest
-    :param proxies: A dictionary of schemes or schemes and hosts to proxy URLs
-    :param trust_env: Boolean declaring whether to trust environment configs
-
-    :rtype: dict
-    """
-    proxies = proxies if proxies is not None else {}
-    url = request.url
-    scheme = urlparse(url).scheme
-    no_proxy = proxies.get("no_proxy")
-    new_proxies = proxies.copy()
-
-    if trust_env and not should_bypass_proxies(url, no_proxy=no_proxy):
-        environ_proxies = get_environ_proxies(url, no_proxy=no_proxy)
-
-        proxy = environ_proxies.get(scheme, environ_proxies.get("all"))
-
-        if proxy:
-            new_proxies.setdefault(scheme, proxy)
-    return new_proxies
-
-
 def default_user_agent(name="python-requests"):
     """
     Return a string representing the default user agent.
 
     :rtype: str
     """
-    return f"{name}/{__version__}"
+    return '%s/%s' % (name, __version__)
 
 
 def default_headers():
     """
     :rtype: requests.structures.CaseInsensitiveDict
     """
-    return CaseInsensitiveDict(
-        {
-            "User-Agent": default_user_agent(),
-            "Accept-Encoding": DEFAULT_ACCEPT_ENCODING,
-            "Accept": "*/*",
-            "Connection": "keep-alive",
-        }
-    )
+    return CaseInsensitiveDict({
+        'User-Agent': default_user_agent(),
+        'Accept-Encoding': ', '.join(('gzip', 'deflate')),
+        'Accept': '*/*',
+        'Connection': 'keep-alive',
+    })
 
 
 def parse_header_links(value):
@@ -914,23 +836,23 @@ def parse_header_links(value):
 
     links = []
 
-    replace_chars = " '\""
+    replace_chars = ' \'"'
 
     value = value.strip(replace_chars)
     if not value:
         return links
 
-    for val in re.split(", *<", value):
+    for val in re.split(', *<', value):
         try:
-            url, params = val.split(";", 1)
+            url, params = val.split(';', 1)
         except ValueError:
-            url, params = val, ""
+            url, params = val, ''
 
-        link = {"url": url.strip("<> '\"")}
+        link = {'url': url.strip('<> \'"')}
 
-        for param in params.split(";"):
+        for param in params.split(';'):
             try:
-                key, value = param.split("=")
+                key, value = param.split('=')
             except ValueError:
                 break
 
@@ -942,7 +864,7 @@ def parse_header_links(value):
 
 
 # Null bytes; no need to recreate these on each call to guess_json_utf
-_null = "\x00".encode("ascii")  # encoding to ASCII for Python 3
+_null = '\x00'.encode('ascii')  # encoding to ASCII for Python 3
 _null2 = _null * 2
 _null3 = _null * 3
 
@@ -956,25 +878,25 @@ def guess_json_utf(data):
     # determine the encoding. Also detect a BOM, if present.
     sample = data[:4]
     if sample in (codecs.BOM_UTF32_LE, codecs.BOM_UTF32_BE):
-        return "utf-32"  # BOM included
+        return 'utf-32'     # BOM included
     if sample[:3] == codecs.BOM_UTF8:
-        return "utf-8-sig"  # BOM included, MS style (discouraged)
+        return 'utf-8-sig'  # BOM included, MS style (discouraged)
     if sample[:2] in (codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE):
-        return "utf-16"  # BOM included
+        return 'utf-16'     # BOM included
     nullcount = sample.count(_null)
     if nullcount == 0:
-        return "utf-8"
+        return 'utf-8'
     if nullcount == 2:
-        if sample[::2] == _null2:  # 1st and 3rd are null
-            return "utf-16-be"
+        if sample[::2] == _null2:   # 1st and 3rd are null
+            return 'utf-16-be'
         if sample[1::2] == _null2:  # 2nd and 4th are null
-            return "utf-16-le"
+            return 'utf-16-le'
         # Did not detect 2 valid UTF-16 ascii-range characters
     if nullcount == 3:
         if sample[:3] == _null3:
-            return "utf-32-be"
+            return 'utf-32-be'
         if sample[1:] == _null3:
-            return "utf-32-le"
+            return 'utf-32-le'
         # Did not detect a valid UTF-32 ascii-range character
     return None
 
@@ -985,27 +907,15 @@ def prepend_scheme_if_needed(url, new_scheme):
 
     :rtype: str
     """
-    parsed = parse_url(url)
-    scheme, auth, host, port, path, query, fragment = parsed
+    scheme, netloc, path, params, query, fragment = urlparse(url, new_scheme)
 
-    # A defect in urlparse determines that there isn't a netloc present in some
-    # urls. We previously assumed parsing was overly cautious, and swapped the
-    # netloc and path. Due to a lack of tests on the original defect, this is
-    # maintained with parse_url for backwards compatibility.
-    netloc = parsed.netloc
+    # urlparse is a finicky beast, and sometimes decides that there isn't a
+    # netloc present. Assume that it's being over-cautious, and switch netloc
+    # and path if urlparse decided there was no netloc.
     if not netloc:
         netloc, path = path, netloc
 
-    if auth:
-        # parse_url doesn't provide the netloc with auth
-        # so we'll add it ourselves.
-        netloc = "@".join([auth, netloc])
-    if scheme is None:
-        scheme = new_scheme
-    if path is None:
-        path = ""
-
-    return urlunparse((scheme, netloc, path, "", query, fragment))
+    return urlunparse((scheme, netloc, path, params, query, fragment))
 
 
 def get_auth_from_url(url):
@@ -1019,36 +929,37 @@ def get_auth_from_url(url):
     try:
         auth = (unquote(parsed.username), unquote(parsed.password))
     except (AttributeError, TypeError):
-        auth = ("", "")
+        auth = ('', '')
 
     return auth
 
 
+# Moved outside of function to avoid recompile every call
+_CLEAN_HEADER_REGEX_BYTE = re.compile(b'^\\S[^\\r\\n]*$|^$')
+_CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$')
+
+
 def check_header_validity(header):
-    """Verifies that header parts don't contain leading whitespace
-    reserved characters, or return characters.
+    """Verifies that header value is a string which doesn't contain
+    leading whitespace or return characters. This prevents unintended
+    header injection.
 
     :param header: tuple, in the format (name, value).
     """
     name, value = header
+    if value is None:
+        return
 
-    for part in header:
-        if type(part) not in HEADER_VALIDATORS:
-            raise InvalidHeader(
-                f"Header part ({part!r}) from {{{name!r}: {value!r}}} must be "
-                f"of type str or bytes, not {type(part)}"
-            )
-
-    _validate_header_part(name, "name", HEADER_VALIDATORS[type(name)][0])
-    _validate_header_part(value, "value", HEADER_VALIDATORS[type(value)][1])
-
-
-def _validate_header_part(header_part, header_kind, validator):
-    if not validator.match(header_part):
-        raise InvalidHeader(
-            f"Invalid leading whitespace, reserved character(s), or return"
-            f"character(s) in header {header_kind}: {header_part!r}"
-        )
+    if isinstance(value, bytes):
+        pat = _CLEAN_HEADER_REGEX_BYTE
+    else:
+        pat = _CLEAN_HEADER_REGEX_STR
+    try:
+        if not pat.match(value):
+            raise InvalidHeader("Invalid return character or leading space in header: %s" % name)
+    except TypeError:
+        raise InvalidHeader("Value for header {%s: %s} must be of type str or "
+                            "bytes, not %s" % (name, value, type(value)))
 
 
 def urldefragauth(url):
@@ -1063,24 +974,21 @@ def urldefragauth(url):
     if not netloc:
         netloc, path = path, netloc
 
-    netloc = netloc.rsplit("@", 1)[-1]
+    netloc = netloc.rsplit('@', 1)[-1]
 
-    return urlunparse((scheme, netloc, path, params, query, ""))
+    return urlunparse((scheme, netloc, path, params, query, ''))
 
 
 def rewind_body(prepared_request):
     """Move file pointer back to its recorded starting position
     so it can be read again on redirect.
     """
-    body_seek = getattr(prepared_request.body, "seek", None)
-    if body_seek is not None and isinstance(
-        prepared_request._body_position, integer_types
-    ):
+    body_seek = getattr(prepared_request.body, 'seek', None)
+    if body_seek is not None and isinstance(prepared_request._body_position, integer_types):
         try:
             body_seek(prepared_request._body_position)
-        except OSError:
-            raise UnrewindableBodyError(
-                "An error occurred when rewinding request body for redirect."
-            )
+        except (IOError, OSError):
+            raise UnrewindableBodyError("An error occurred when rewinding request "
+                                        "body for redirect.")
     else:
         raise UnrewindableBodyError("Unable to rewind request body for redirect.")

requirements-dev.txt

@@ -1,12 +1,6 @@
--e .[socks]
-pytest>=2.8.0,<=6.2.5
+pytest>=2.8.0,<=3.10.1
 pytest-cov
-pytest-httpbin==1.0.0
+pytest-httpbin<1.0
 pytest-mock==2.0.0
 httpbin==0.7.0
-trustme
 wheel
-
-# Flask Stack
-Flask>1.0,<2.0
-markupsafe<2.1

setup.cfg

@@ -1,17 +1,5 @@
+[bdist_wheel]
+universal = 1
+
 [metadata]
 license_file = LICENSE
-provides-extra =
-    socks
-    use_chardet_on_py3
-requires-dist =
-    certifi>=2017.4.17
-    charset_normalizer>=2,<4
-    idna>=2.5,<4
-    urllib3>=1.21.1,<1.27
-
-[flake8]
-ignore = E203, E501, W503
-per-file-ignores =
-    requests/__init__.py:E402, F401
-    requests/compat.py:E402, F401
-    tests/compat.py:F401

setup.py

@@ -1,44 +1,26 @@
 #!/usr/bin/env python
+# Learn more: https://github.com/kennethreitz/setup.py
 import os
+import re
 import sys
+
 from codecs import open
 
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
-CURRENT_PYTHON = sys.version_info[:2]
-REQUIRED_PYTHON = (3, 7)
-
-if CURRENT_PYTHON < REQUIRED_PYTHON:
-    sys.stderr.write(
-        """
-==========================
-Unsupported Python version
-==========================
-This version of Requests requires at least Python {}.{}, but
-you're trying to install it on Python {}.{}. To resolve this,
-consider upgrading to a supported Python version.
-
-If you can't upgrade your Python version, you'll need to
-pin to an older version of Requests (<2.28).
-""".format(
-            *(REQUIRED_PYTHON + CURRENT_PYTHON)
-        )
-    )
-    sys.exit(1)
-
+here = os.path.abspath(os.path.dirname(__file__))
 
 class PyTest(TestCommand):
-    user_options = [("pytest-args=", "a", "Arguments to pass into py.test")]
+    user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
 
     def initialize_options(self):
         TestCommand.initialize_options(self)
         try:
             from multiprocessing import cpu_count
-
-            self.pytest_args = ["-n", str(cpu_count()), "--boxed"]
+            self.pytest_args = ['-n', str(cpu_count()), '--boxed']
         except (ImportError, NotImplementedError):
-            self.pytest_args = ["-n", "1", "--boxed"]
+            self.pytest_args = ['-n', '1', '--boxed']
 
     def finalize_options(self):
         TestCommand.finalize_options(self)
@@ -51,82 +33,80 @@ class PyTest(TestCommand):
         errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
-
 # 'setup.py publish' shortcut.
-if sys.argv[-1] == "publish":
-    os.system("python setup.py sdist bdist_wheel")
-    os.system("twine upload dist/*")
+if sys.argv[-1] == 'publish':
+    os.system('python setup.py sdist bdist_wheel')
+    os.system('twine upload dist/*')
     sys.exit()
 
+packages = ['requests']
+
 requires = [
-    "charset_normalizer>=2,<4",
-    "idna>=2.5,<4",
-    "urllib3>=1.21.1,<1.27",
-    "certifi>=2017.4.17",
+    'chardet>=3.0.2,<4',
+    'idna>=2.5,<3',
+    'urllib3>=1.21.1,<1.27',
+    'certifi>=2017.4.17'
+
 ]
 test_requirements = [
-    "pytest-httpbin==0.0.7",
-    "pytest-cov",
-    "pytest-mock",
-    "pytest-xdist",
-    "PySocks>=1.5.6, !=1.5.7",
-    "pytest>=3",
+    'pytest-httpbin==0.0.7',
+    'pytest-cov',
+    'pytest-mock',
+    'pytest-xdist',
+    'PySocks>=1.5.6, !=1.5.7',
+    'pytest>=3'
 ]
 
 about = {}
-here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, "requests", "__version__.py"), "r", "utf-8") as f:
+with open(os.path.join(here, 'requests', '__version__.py'), 'r', 'utf-8') as f:
     exec(f.read(), about)
 
-with open("README.md", "r", "utf-8") as f:
+with open('README.md', 'r', 'utf-8') as f:
     readme = f.read()
 
 setup(
-    name=about["__title__"],
-    version=about["__version__"],
-    description=about["__description__"],
+    name=about['__title__'],
+    version=about['__version__'],
+    description=about['__description__'],
     long_description=readme,
-    long_description_content_type="text/markdown",
-    author=about["__author__"],
-    author_email=about["__author_email__"],
-    url=about["__url__"],
-    packages=["requests"],
-    package_data={"": ["LICENSE", "NOTICE"]},
-    package_dir={"requests": "requests"},
+    long_description_content_type='text/markdown',
+    author=about['__author__'],
+    author_email=about['__author_email__'],
+    url=about['__url__'],
+    packages=packages,
+    package_data={'': ['LICENSE', 'NOTICE']},
+    package_dir={'requests': 'requests'},
     include_package_data=True,
-    python_requires=">=3.7, <4",
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
     install_requires=requires,
-    license=about["__license__"],
+    license=about['__license__'],
     zip_safe=False,
     classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "Natural Language :: English",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Software Development :: Libraries",
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy'
     ],
-    cmdclass={"test": PyTest},
+    cmdclass={'test': PyTest},
     tests_require=test_requirements,
     extras_require={
-        "security": [],
-        "socks": ["PySocks>=1.5.6, !=1.5.7"],
-        "use_chardet_on_py3": ["chardet>=3.0.2,<6"],
+        'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4'],
+        'socks': ['PySocks>=1.5.6, !=1.5.7'],
+        'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'],
     },
     project_urls={
-        "Documentation": "https://requests.readthedocs.io",
-        "Source": "https://github.com/psf/requests",
+        'Documentation': 'https://requests.readthedocs.io',
+        'Source': 'https://github.com/psf/requests',
     },
 )

tests/__init__.py

@@ -1,10 +1,13 @@
+# -*- coding: utf-8 -*-
+
 """Requests test package initialisation."""
 
 import warnings
 
+import urllib3
 from urllib3.exceptions import SNIMissingWarning
 
 # urllib3 sets SNIMissingWarning to only go off once,
 # while this test suite requires it to always fire
 # so that it occurs during test_requests.test_https_warnings
-warnings.simplefilter("always", SNIMissingWarning)
+warnings.simplefilter('always', SNIMissingWarning)

tests/compat.py

@@ -1,4 +1,7 @@
-import warnings
+# -*- coding: utf-8 -*-
+
+from requests.compat import is_py3
+
 
 try:
     import StringIO
@@ -10,14 +13,9 @@ try:
 except ImportError:
     cStringIO = None
 
-
-def u(s):
-    warnings.warn(
-        (
-            "This helper function is no longer relevant in Python 3. "
-            "Usage of this alias should be discontinued as it will be "
-            "removed in a future release of Requests."
-        ),
-        DeprecationWarning,
-    )
-    return s
+if is_py3:
+    def u(s):
+        return s
+else:
+    def u(s):
+        return s.decode('unicode-escape')

tests/conftest.py

@@ -1,23 +1,15 @@
-try:
-    from http.server import HTTPServer, SimpleHTTPRequestHandler
-except ImportError:
-    from BaseHTTPServer import HTTPServer
-    from SimpleHTTPServer import SimpleHTTPRequestHandler
-
-import ssl
-import threading
+# -*- coding: utf-8 -*-
 
 import pytest
-
 from requests.compat import urljoin
 
 
 def prepare_url(value):
     # Issue #1483: Make sure the URL always has a trailing slash
-    httpbin_url = value.url.rstrip("/") + "/"
+    httpbin_url = value.url.rstrip('/') + '/'
 
     def inner(*suffix):
-        return urljoin(httpbin_url, "/".join(suffix))
+        return urljoin(httpbin_url, '/'.join(suffix))
 
     return inner
 
@@ -30,29 +22,3 @@ def httpbin(httpbin):
 @pytest.fixture
 def httpbin_secure(httpbin_secure):
     return prepare_url(httpbin_secure)
-
-
-@pytest.fixture
-def nosan_server(tmp_path_factory):
-    # delay importing until the fixture in order to make it possible
-    # to deselect the test via command-line when trustme is not available
-    import trustme
-
-    tmpdir = tmp_path_factory.mktemp("certs")
-    ca = trustme.CA()
-    # only commonName, no subjectAltName
-    server_cert = ca.issue_cert(common_name="localhost")
-    ca_bundle = str(tmpdir / "ca.pem")
-    ca.cert_pem.write_to_path(ca_bundle)
-
-    context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-    server_cert.configure_cert(context)
-    server = HTTPServer(("localhost", 0), SimpleHTTPRequestHandler)
-    server.socket = context.wrap_socket(server.socket, server_side=True)
-    server_thread = threading.Thread(target=server.serve_forever)
-    server_thread.start()
-
-    yield "localhost", server.server_address[1], ca_bundle
-
-    server.shutdown()
-    server_thread.join()

tests/test_help.py

@@ -1,12 +1,18 @@
+# -*- encoding: utf-8
+
+import sys
+
+import pytest
+
 from requests.help import info
 
 
 def test_system_ssl():
     """Verify we're actually setting system_ssl when it should be available."""
-    assert info()["system_ssl"]["version"] != ""
+    assert info()['system_ssl']['version'] != ''
 
 
-class VersionedPackage:
+class VersionedPackage(object):
     def __init__(self, version):
         self.__version__ = version
 
@@ -15,11 +21,11 @@ def test_idna_without_version_attribute(mocker):
     """Older versions of IDNA don't provide a __version__ attribute, verify
     that if we have such a package, we don't blow up.
     """
-    mocker.patch("requests.help.idna", new=None)
-    assert info()["idna"] == {"version": ""}
+    mocker.patch('requests.help.idna', new=None)
+    assert info()['idna'] == {'version': ''}
 
 
 def test_idna_with_version_attribute(mocker):
     """Verify we're actually setting idna version when it should be available."""
-    mocker.patch("requests.help.idna", new=VersionedPackage("2.6"))
-    assert info()["idna"] == {"version": "2.6"}
+    mocker.patch('requests.help.idna', new=VersionedPackage('2.6'))
+    assert info()['idna'] == {'version': '2.6'}

tests/test_hooks.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 
 from requests import hooks
@@ -8,15 +10,14 @@ def hook(value):
 
 
 @pytest.mark.parametrize(
-    "hooks_list, result",
-    (
-        (hook, "ata"),
-        ([hook, lambda x: None, hook], "ta"),
-    ),
+    'hooks_list, result', (
+        (hook, 'ata'),
+        ([hook, lambda x: None, hook], 'ta'),
+    )
 )
 def test_hooks(hooks_list, result):
-    assert hooks.dispatch_hook("response", {"response": hooks_list}, "Data") == result
+    assert hooks.dispatch_hook('response', {'response': hooks_list}, 'Data') == result
 
 
 def test_default_hooks():
-    assert hooks.default_hooks() == {"response": []}
+    assert hooks.default_hooks() == {'response': []}

tests/test_lowlevel.py

@@ -1,127 +1,27 @@
-import threading
+# -*- coding: utf-8 -*-
 
 import pytest
+import threading
+import requests
+
 from tests.testserver.server import Server, consume_socket_content
 
-import requests
-from requests.compat import JSONDecodeError
-
 from .utils import override_environ
 
 
-def echo_response_handler(sock):
-    """Simple handler that will take request and echo it back to requester."""
-    request_content = consume_socket_content(sock, timeout=0.5)
-
-    text_200 = (
-        b"HTTP/1.1 200 OK\r\n"
-        b"Content-Length: %d\r\n\r\n"
-        b"%s"
-    ) % (len(request_content), request_content)
-    sock.send(text_200)
-
-
 def test_chunked_upload():
     """can safely send generators"""
     close_server = threading.Event()
     server = Server.basic_response_server(wait_to_close_event=close_server)
-    data = iter([b"a", b"b", b"c"])
+    data = iter([b'a', b'b', b'c'])
 
     with server as (host, port):
-        url = f"http://{host}:{port}/"
+        url = 'http://{}:{}/'.format(host, port)
         r = requests.post(url, data=data, stream=True)
         close_server.set()  # release server block
 
     assert r.status_code == 200
-    assert r.request.headers["Transfer-Encoding"] == "chunked"
-
-
-def test_chunked_encoding_error():
-    """get a ChunkedEncodingError if the server returns a bad response"""
-
-    def incomplete_chunked_response_handler(sock):
-        request_content = consume_socket_content(sock, timeout=0.5)
-
-        # The server never ends the request and doesn't provide any valid chunks
-        sock.send(
-            b"HTTP/1.1 200 OK\r\n"
-            b"Transfer-Encoding: chunked\r\n"
-        )
-
-        return request_content
-
-    close_server = threading.Event()
-    server = Server(incomplete_chunked_response_handler)
-
-    with server as (host, port):
-        url = f"http://{host}:{port}/"
-        with pytest.raises(requests.exceptions.ChunkedEncodingError):
-            requests.get(url)
-        close_server.set()  # release server block
-
-
-def test_chunked_upload_uses_only_specified_host_header():
-    """Ensure we use only the specified Host header for chunked requests."""
-    close_server = threading.Event()
-    server = Server(echo_response_handler, wait_to_close_event=close_server)
-
-    data = iter([b"a", b"b", b"c"])
-    custom_host = "sample-host"
-
-    with server as (host, port):
-        url = f"http://{host}:{port}/"
-        r = requests.post(url, data=data, headers={"Host": custom_host}, stream=True)
-        close_server.set()  # release server block
-
-    expected_header = b"Host: %s\r\n" % custom_host.encode("utf-8")
-    assert expected_header in r.content
-    assert r.content.count(b"Host: ") == 1
-
-
-def test_chunked_upload_doesnt_skip_host_header():
-    """Ensure we don't omit all Host headers with chunked requests."""
-    close_server = threading.Event()
-    server = Server(echo_response_handler, wait_to_close_event=close_server)
-
-    data = iter([b"a", b"b", b"c"])
-
-    with server as (host, port):
-        expected_host = f"{host}:{port}"
-        url = f"http://{host}:{port}/"
-        r = requests.post(url, data=data, stream=True)
-        close_server.set()  # release server block
-
-    expected_header = b"Host: %s\r\n" % expected_host.encode("utf-8")
-    assert expected_header in r.content
-    assert r.content.count(b"Host: ") == 1
-
-
-def test_conflicting_content_lengths():
-    """Ensure we correctly throw an InvalidHeader error if multiple
-    conflicting Content-Length headers are returned.
-    """
-
-    def multiple_content_length_response_handler(sock):
-        request_content = consume_socket_content(sock, timeout=0.5)
-        response = (
-            b"HTTP/1.1 200 OK\r\n"
-            b"Content-Type: text/plain\r\n"
-            b"Content-Length: 16\r\n"
-            b"Content-Length: 32\r\n\r\n"
-            b"-- Bad Actor -- Original Content\r\n"
-        )
-        sock.send(response)
-
-        return request_content
-
-    close_server = threading.Event()
-    server = Server(multiple_content_length_response_handler)
-
-    with server as (host, port):
-        url = f"http://{host}:{port}/"
-        with pytest.raises(requests.exceptions.InvalidHeader):
-            requests.get(url)
-        close_server.set()
+    assert r.request.headers['Transfer-Encoding'] == 'chunked'
 
 
 def test_digestauth_401_count_reset_on_redirect():
@@ -177,7 +77,7 @@ def test_digestauth_401_count_reset_on_redirect():
     server = Server(digest_response_handler, wait_to_close_event=close_server)
 
     with server as (host, port):
-        url = f'http://{host}:{port}/'
+        url = 'http://{}:{}/'.format(host, port)
         r = requests.get(url, auth=auth)
         # Verify server succeeded in authenticating.
         assert r.status_code == 200
@@ -227,7 +127,7 @@ def test_digestauth_401_only_sent_once():
     server = Server(digest_failed_response_handler, wait_to_close_event=close_server)
 
     with server as (host, port):
-        url = f'http://{host}:{port}/'
+        url = 'http://{}:{}/'.format(host, port)
         r = requests.get(url, auth=auth)
         # Verify server didn't authenticate us.
         assert r.status_code == 401
@@ -264,7 +164,7 @@ def test_digestauth_only_on_4xx():
     server = Server(digest_response_handler, wait_to_close_event=close_server)
 
     with server as (host, port):
-        url = f'http://{host}:{port}/'
+        url = 'http://{}:{}/'.format(host, port)
         r = requests.get(url, auth=auth)
         # Verify server didn't receive auth from us.
         assert r.status_code == 200
@@ -281,17 +181,17 @@ _schemes_by_var_prefix = [
 _proxy_combos = []
 for prefix, schemes in _schemes_by_var_prefix:
     for scheme in schemes:
-        _proxy_combos.append((f"{prefix}_proxy", scheme))
+        _proxy_combos.append(("{}_proxy".format(prefix), scheme))
 
 _proxy_combos += [(var.upper(), scheme) for var, scheme in _proxy_combos]
 
 
 @pytest.mark.parametrize("var,scheme", _proxy_combos)
 def test_use_proxy_from_environment(httpbin, var, scheme):
-    url = f"{scheme}://httpbin.org"
+    url = "{}://httpbin.org".format(scheme)
     fake_proxy = Server()  # do nothing with the requests; just close the socket
     with fake_proxy as (host, port):
-        proxy_url = f"socks5://{host}:{port}"
+        proxy_url = "socks5://{}:{}".format(host, port)
         kwargs = {var: proxy_url}
         with override_environ(**kwargs):
             # fake proxy's lack of response will cause a ConnectionError
@@ -306,20 +206,18 @@ def test_use_proxy_from_environment(httpbin, var, scheme):
 
 
 def test_redirect_rfc1808_to_non_ascii_location():
-    path = 'š'
+    path = u'š'
     expected_path = b'%C5%A1'
     redirect_request = []  # stores the second request to the server
 
     def redirect_resp_handler(sock):
         consume_socket_content(sock, timeout=0.5)
-        location = f'//{host}:{port}/{path}'
+        location = u'//{}:{}/{}'.format(host, port, path)
         sock.send(
-            (
-                b'HTTP/1.1 301 Moved Permanently\r\n'
-                b'Content-Length: 0\r\n'
-                b'Location: %s\r\n'
-                b'\r\n'
-            ) % location.encode('utf8')
+            b'HTTP/1.1 301 Moved Permanently\r\n'
+            b'Content-Length: 0\r\n'
+            b'Location: ' + location.encode('utf8') + b'\r\n'
+            b'\r\n'
         )
         redirect_request.append(consume_socket_content(sock, timeout=0.5))
         sock.send(b'HTTP/1.1 200 OK\r\n\r\n')
@@ -328,24 +226,31 @@ def test_redirect_rfc1808_to_non_ascii_location():
     server = Server(redirect_resp_handler, wait_to_close_event=close_server)
 
     with server as (host, port):
-        url = f'http://{host}:{port}'
+        url = u'http://{}:{}'.format(host, port)
         r = requests.get(url=url, allow_redirects=True)
         assert r.status_code == 200
         assert len(r.history) == 1
         assert r.history[0].status_code == 301
         assert redirect_request[0].startswith(b'GET /' + expected_path + b' HTTP/1.1')
-        assert r.url == '{}/{}'.format(url, expected_path.decode('ascii'))
+        assert r.url == u'{}/{}'.format(url, expected_path.decode('ascii'))
 
         close_server.set()
 
-
 def test_fragment_not_sent_with_request():
     """Verify that the fragment portion of a URI isn't sent to the server."""
+    def response_handler(sock):
+        req = consume_socket_content(sock, timeout=0.5)
+        sock.send(
+            b'HTTP/1.1 200 OK\r\n'
+            b'Content-Length: '+bytes(len(req))+b'\r\n'
+            b'\r\n'+req
+        )
+
     close_server = threading.Event()
-    server = Server(echo_response_handler, wait_to_close_event=close_server)
+    server = Server(response_handler, wait_to_close_event=close_server)
 
     with server as (host, port):
-        url = f'http://{host}:{port}/path/to/thing/#view=edit&token=hunter2'
+        url = 'http://{}:{}/path/to/thing/#view=edit&token=hunter2'.format(host, port)
         r = requests.get(url)
         raw_request = r.content
 
@@ -360,7 +265,6 @@ def test_fragment_not_sent_with_request():
 
         close_server.set()
 
-
 def test_fragment_update_on_redirect():
     """Verify we only append previous fragment if one doesn't exist on new
     location. If a new fragment is encountered in a Location header, it should
@@ -389,40 +293,17 @@ def test_fragment_update_on_redirect():
     server = Server(response_handler, wait_to_close_event=close_server)
 
     with server as (host, port):
-        url = f'http://{host}:{port}/path/to/thing/#view=edit&token=hunter2'
+        url = 'http://{}:{}/path/to/thing/#view=edit&token=hunter2'.format(host, port)
         r = requests.get(url)
+        raw_request = r.content
 
         assert r.status_code == 200
         assert len(r.history) == 2
         assert r.history[0].request.url == url
 
         # Verify we haven't overwritten the location with our previous fragment.
-        assert r.history[1].request.url == f'http://{host}:{port}/get#relevant-section'
+        assert r.history[1].request.url == 'http://{}:{}/get#relevant-section'.format(host, port)
         # Verify previous fragment is used and not the original.
-        assert r.url == f'http://{host}:{port}/final-url/#relevant-section'
+        assert r.url == 'http://{}:{}/final-url/#relevant-section'.format(host, port)
 
         close_server.set()
-
-
-def test_json_decode_compatibility_for_alt_utf_encodings():
-
-    def response_handler(sock):
-        consume_socket_content(sock, timeout=0.5)
-        sock.send(
-            b'HTTP/1.1 200 OK\r\n'
-            b'Content-Length: 18\r\n\r\n'
-            b'\xff\xfe{\x00"\x00K0"\x00=\x00"\x00\xab0"\x00\r\n'
-        )
-
-    close_server = threading.Event()
-    server = Server(response_handler, wait_to_close_event=close_server)
-
-    with server as (host, port):
-        url = f'http://{host}:{port}/'
-        r = requests.get(url)
-    r.encoding = None
-    with pytest.raises(requests.exceptions.JSONDecodeError) as excinfo:
-        r.json()
-    assert isinstance(excinfo.value, requests.exceptions.RequestException)
-    assert isinstance(excinfo.value, JSONDecodeError)
-    assert r.text not in str(excinfo.value)

tests/test_structures.py

@@ -1,25 +1,26 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 
 from requests.structures import CaseInsensitiveDict, LookupDict
 
 
 class TestCaseInsensitiveDict:
+
     @pytest.fixture(autouse=True)
     def setup(self):
         """CaseInsensitiveDict instance with "Accept" header."""
         self.case_insensitive_dict = CaseInsensitiveDict()
-        self.case_insensitive_dict["Accept"] = "application/json"
+        self.case_insensitive_dict['Accept'] = 'application/json'
 
     def test_list(self):
-        assert list(self.case_insensitive_dict) == ["Accept"]
+        assert list(self.case_insensitive_dict) == ['Accept']
 
-    possible_keys = pytest.mark.parametrize(
-        "key", ("accept", "ACCEPT", "aCcEpT", "Accept")
-    )
+    possible_keys = pytest.mark.parametrize('key', ('accept', 'ACCEPT', 'aCcEpT', 'Accept'))
 
     @possible_keys
     def test_getitem(self, key):
-        assert self.case_insensitive_dict[key] == "application/json"
+        assert self.case_insensitive_dict[key] == 'application/json'
 
     @possible_keys
     def test_delitem(self, key):
@@ -27,9 +28,7 @@ class TestCaseInsensitiveDict:
         assert key not in self.case_insensitive_dict
 
     def test_lower_items(self):
-        assert list(self.case_insensitive_dict.lower_items()) == [
-            ("accept", "application/json")
-        ]
+        assert list(self.case_insensitive_dict.lower_items()) == [('accept', 'application/json')]
 
     def test_repr(self):
         assert repr(self.case_insensitive_dict) == "{'Accept': 'application/json'}"
@@ -40,33 +39,32 @@ class TestCaseInsensitiveDict:
         assert copy == self.case_insensitive_dict
 
     @pytest.mark.parametrize(
-        "other, result",
-        (
-            ({"AccePT": "application/json"}, True),
+        'other, result', (
+            ({'AccePT': 'application/json'}, True),
             ({}, False),
-            (None, False),
-        ),
+            (None, False)
+        )
     )
     def test_instance_equality(self, other, result):
         assert (self.case_insensitive_dict == other) is result
 
 
 class TestLookupDict:
+
     @pytest.fixture(autouse=True)
     def setup(self):
         """LookupDict instance with "bad_gateway" attribute."""
-        self.lookup_dict = LookupDict("test")
+        self.lookup_dict = LookupDict('test')
         self.lookup_dict.bad_gateway = 502
 
     def test_repr(self):
         assert repr(self.lookup_dict) == "<lookup 'test'>"
 
     get_item_parameters = pytest.mark.parametrize(
-        "key, value",
-        (
-            ("bad_gateway", 502),
-            ("not_a_key", None),
-        ),
+        'key, value', (
+            ('bad_gateway', 502),
+            ('not_a_key', None)
+        )
     )
 
     @get_item_parameters

tests/test_testserver.py

@@ -1,14 +1,16 @@
-import socket
+# -*- coding: utf-8 -*-
+
 import threading
+import socket
 import time
 
 import pytest
-from tests.testserver.server import Server
-
 import requests
+from tests.testserver.server import Server
 
 
 class TestTestServer:
+
     def test_basic(self):
         """messages are sent and received properly"""
         question = b"success?"
@@ -42,37 +44,36 @@ class TestTestServer:
     def test_text_response(self):
         """the text_response_server sends the given text"""
         server = Server.text_response_server(
-            "HTTP/1.1 200 OK\r\n" "Content-Length: 6\r\n" "\r\nroflol"
+            "HTTP/1.1 200 OK\r\n" +
+            "Content-Length: 6\r\n" +
+            "\r\nroflol"
         )
 
         with server as (host, port):
-            r = requests.get(f"http://{host}:{port}")
+            r = requests.get('http://{}:{}'.format(host, port))
 
             assert r.status_code == 200
-            assert r.text == "roflol"
-            assert r.headers["Content-Length"] == "6"
+            assert r.text == u'roflol'
+            assert r.headers['Content-Length'] == '6'
 
     def test_basic_response(self):
         """the basic response server returns an empty http response"""
         with Server.basic_response_server() as (host, port):
-            r = requests.get(f"http://{host}:{port}")
+            r = requests.get('http://{}:{}'.format(host, port))
             assert r.status_code == 200
-            assert r.text == ""
-            assert r.headers["Content-Length"] == "0"
+            assert r.text == u''
+            assert r.headers['Content-Length'] == '0'
 
     def test_basic_waiting_server(self):
         """the server waits for the block_server event to be set before closing"""
         block_server = threading.Event()
 
-        with Server.basic_response_server(wait_to_close_event=block_server) as (
-            host,
-            port,
-        ):
+        with Server.basic_response_server(wait_to_close_event=block_server) as (host, port):
             sock = socket.socket()
             sock.connect((host, port))
-            sock.sendall(b"send something")
+            sock.sendall(b'send something')
             time.sleep(2.5)
-            sock.sendall(b"still alive")
+            sock.sendall(b'still alive')
             block_server.set()  # release server block
 
     def test_multiple_requests(self):
@@ -82,7 +83,7 @@ class TestTestServer:
         server = Server.basic_response_server(requests_to_handle=requests_to_handle)
 
         with server as (host, port):
-            server_url = f"http://{host}:{port}"
+            server_url = 'http://{}:{}'.format(host, port)
             for _ in range(requests_to_handle):
                 r = requests.get(server_url)
                 assert r.status_code == 200
@@ -96,8 +97,8 @@ class TestTestServer:
         """can check the requests content"""
         # TODO: figure out why this sometimes fails when using pytest-xdist.
         server = Server.basic_response_server(requests_to_handle=2)
-        first_request = b"put your hands up in the air"
-        second_request = b"put your hand down in the floor"
+        first_request = b'put your hands up in the air'
+        second_request = b'put your hand down in the floor'
 
         with server as address:
             sock1 = socket.socket()
@@ -122,15 +123,15 @@ class TestTestServer:
             sock = socket.socket()
             sock.connect(address)
             time.sleep(1.5)
-            sock.sendall(b"hehehe, not received")
+            sock.sendall(b'hehehe, not received')
             sock.close()
 
-        assert server.handler_results[0] == b""
+        assert server.handler_results[0] == b''
 
     def test_request_recovery_with_bigger_timeout(self):
         """a biggest timeout can be specified"""
         server = Server.basic_response_server(request_timeout=3)
-        data = b"bananadine"
+        data = b'bananadine'
 
         with server as address:
             sock = socket.socket()

tests/testserver/server.py

@@ -1,11 +1,13 @@
-import select
-import socket
+# -*- coding: utf-8 -*-
+
 import threading
+import socket
+import select
 
 
 def consume_socket_content(sock, timeout=0.5):
     chunks = 65536
-    content = b""
+    content = b''
 
     while True:
         more_to_read = select.select([sock], [], [], timeout)[0]
@@ -23,18 +25,10 @@ def consume_socket_content(sock, timeout=0.5):
 
 class Server(threading.Thread):
     """Dummy server using for unit testing"""
-
     WAIT_EVENT_TIMEOUT = 5
 
-    def __init__(
-        self,
-        handler=None,
-        host="localhost",
-        port=0,
-        requests_to_handle=1,
-        wait_to_close_event=None,
-    ):
-        super().__init__()
+    def __init__(self, handler=None, host='localhost', port=0, requests_to_handle=1, wait_to_close_event=None):
+        super(Server, self).__init__()
 
         self.handler = handler or consume_socket_content
         self.handler_results = []
@@ -51,16 +45,19 @@ class Server(threading.Thread):
     def text_response_server(cls, text, request_timeout=0.5, **kwargs):
         def text_response_handler(sock):
             request_content = consume_socket_content(sock, timeout=request_timeout)
-            sock.send(text.encode("utf-8"))
+            sock.send(text.encode('utf-8'))
 
             return request_content
 
+
         return Server(text_response_handler, **kwargs)
 
     @classmethod
     def basic_response_server(cls, **kwargs):
         return cls.text_response_server(
-            "HTTP/1.1 200 OK\r\n" + "Content-Length: 0\r\n\r\n", **kwargs
+            "HTTP/1.1 200 OK\r\n" +
+            "Content-Length: 0\r\n\r\n",
+            **kwargs
         )
 
     def run(self):
@@ -74,20 +71,20 @@ class Server(threading.Thread):
             if self.wait_to_close_event:
                 self.wait_to_close_event.wait(self.WAIT_EVENT_TIMEOUT)
         finally:
-            self.ready_event.set()  # just in case of exception
+            self.ready_event.set() # just in case of exception
             self._close_server_sock_ignore_errors()
             self.stop_event.set()
 
     def _create_socket_and_bind(self):
         sock = socket.socket()
         sock.bind((self.host, self.port))
-        sock.listen()
+        sock.listen(0)
         return sock
 
     def _close_server_sock_ignore_errors(self):
         try:
             self.server_sock.close()
-        except OSError:
+        except IOError:
             pass
 
     def _handle_requests(self):
@@ -103,20 +100,17 @@ class Server(threading.Thread):
 
     def _accept_connection(self):
         try:
-            ready, _, _ = select.select(
-                [self.server_sock], [], [], self.WAIT_EVENT_TIMEOUT
-            )
+            ready, _, _ = select.select([self.server_sock], [], [], self.WAIT_EVENT_TIMEOUT)
             if not ready:
                 return None
 
             return self.server_sock.accept()[0]
-        except OSError:
+        except (select.error, socket.error):
             return None
 
     def __enter__(self):
         self.start()
-        if not self.ready_event.wait(self.WAIT_EVENT_TIMEOUT):
-            raise RuntimeError("Timeout waiting for server to be ready.")
+        self.ready_event.wait(self.WAIT_EVENT_TIMEOUT)
         return self.host, self.port
 
     def __exit__(self, exc_type, exc_value, traceback):
@@ -131,4 +125,4 @@ class Server(threading.Thread):
         # ensure server thread doesn't get stuck waiting for connections
         self._close_server_sock_ignore_errors()
         self.join()
-        return False  # allow exceptions to propagate
+        return False # allow exceptions to propagate

tests/utils.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import contextlib
 import os
 

tox.ini

@@ -1,18 +1,7 @@
 [tox]
-envlist = py{37,38,39,310,311}-{default, use_chardet_on_py3}
+envlist = py27,py35,py36,py37,py38
 
 [testenv]
-deps = -rrequirements-dev.txt
-extras =
-    security
-    socks
+
 commands =
-    pytest tests
-
-[testenv:default]
-
-[testenv:use_chardet_on_py3]
-extras =
-    security
-    socks
-    use_chardet_on_py3
+    python setup.py test