diff options
| author | Kenneth Reitz <me@kennethreitz.org> | 2018-03-08 13:00:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 13:00:49 -0500 |
| commit | 9c6bd54b44c0b05c6907522e8d9998a87b69c1cd (patch) | |
| tree | 7c86bb2976f5b0ccf4144f8308ba64d20076443f | |
| parent | a58b1e66cbf6479cdf57ef4c4b1e57b1e3176daa (diff) | |
| parent | 4c6d9e1954d13ea2b65ea3b1a8bb1a6be5472edc (diff) | |
| download | python-requests-proposed/3.0.0.tar.gz | |
Merge pull request #4500 from jdufresne/remove-packagesproposed/3.0.0
Remove requests.packages for v3.0.0
| -rw-r--r-- | requests/__init__.py | 1 | ||||
| -rw-r--r-- | requests/packages.py | 14 | ||||
| -rw-r--r-- | tests/test_packages.py | 13 | ||||
| -rw-r--r-- | tests/test_requests.py | 2 |
4 files changed, 0 insertions, 30 deletions
diff --git a/requests/__init__.py b/requests/__init__.py index fc6bd1f2..bd9c8bb3 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -110,7 +110,6 @@ 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 diff --git a/requests/packages.py b/requests/packages.py deleted file mode 100644 index 7232fe0f..00000000 --- a/requests/packages.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -# This code exists for backwards compatibility reasons. -# I don't like it either. Just look the other way. :) - -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(package + '.'): - sys.modules['requests.packages.' + mod] = sys.modules[mod] - -# Kinda cool, though, right? diff --git a/tests/test_packages.py b/tests/test_packages.py deleted file mode 100644 index b55cb68c..00000000 --- a/tests/test_packages.py +++ /dev/null @@ -1,13 +0,0 @@ -import requests - - -def test_can_access_urllib3_attribute(): - requests.packages.urllib3 - - -def test_can_access_idna_attribute(): - requests.packages.idna - - -def test_can_access_chardet_attribute(): - requests.packages.chardet diff --git a/tests/test_requests.py b/tests/test_requests.py index 14120a2c..6d8a1d84 100644 --- a/tests/test_requests.py +++ b/tests/test_requests.py @@ -82,8 +82,6 @@ class TestRequests: requests.put requests.patch requests.post - # Not really an entry point, but people rely on it. - from requests.packages.urllib3.poolmanager import PoolManager @pytest.mark.parametrize( 'exception, url', ( |