diff --git a/requests/packages.py b/requests/packages.py index c31636c5..0ec4f5bb 100644 --- a/requests/packages.py +++ b/requests/packages.py @@ -1,3 +1,15 @@ -import chardet +import sys + +# This code exists for backwards compatibility reasons. +# I don't like it either. Just look the other way. :) + import urllib3 -import idna \ No newline at end of file +sys.modules['requests.packages.urllib3'] = urllib3 + +import idna +sys.modules['requests.packages.idna'] = idna + +import chardet +sys.modules['requests.packages.chardet'] = chardet + +# Kinda cool, though, right? \ No newline at end of file diff --git a/requests/packages/__init__.py b/requests/packages/__init__.py deleted file mode 100755 index a01e9734..00000000 --- a/requests/packages/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import urllib3 \ No newline at end of file diff --git a/requests/packages/urllib3/__init__.py b/requests/packages/urllib3/__init__.py deleted file mode 100755 index 7e8a2a70..00000000 --- a/requests/packages/urllib3/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3 import * \ No newline at end of file diff --git a/requests/packages/urllib3/_collections.py b/requests/packages/urllib3/_collections.py deleted file mode 100755 index 90729820..00000000 --- a/requests/packages/urllib3/_collections.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3._collections import * \ No newline at end of file diff --git a/requests/packages/urllib3/connection.py b/requests/packages/urllib3/connection.py deleted file mode 100755 index 52349e47..00000000 --- a/requests/packages/urllib3/connection.py +++ /dev/null @@ -1 +0,0 @@ -from urllib.connection import * \ No newline at end of file diff --git a/requests/packages/urllib3/connectionpool.py b/requests/packages/urllib3/connectionpool.py deleted file mode 100755 index 1ac6f6aa..00000000 --- a/requests/packages/urllib3/connectionpool.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.connectionpool import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/__init__.py b/requests/packages/urllib3/contrib/__init__.py deleted file mode 100755 index 7bb980c8..00000000 --- a/requests/packages/urllib3/contrib/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/_securetransport/__init__.py b/requests/packages/urllib3/contrib/_securetransport/__init__.py deleted file mode 100755 index 77d64e3a..00000000 --- a/requests/packages/urllib3/contrib/_securetransport/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib._securetransport import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/_securetransport/bindings.py b/requests/packages/urllib3/contrib/_securetransport/bindings.py deleted file mode 100755 index d3bd67fc..00000000 --- a/requests/packages/urllib3/contrib/_securetransport/bindings.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib._securetransport.bindings import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/_securetransport/low_level.py b/requests/packages/urllib3/contrib/_securetransport/low_level.py deleted file mode 100755 index 66f12508..00000000 --- a/requests/packages/urllib3/contrib/_securetransport/low_level.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib._securetransport.bindings.low_level import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/appengine.py b/requests/packages/urllib3/contrib/appengine.py deleted file mode 100755 index f78f99f9..00000000 --- a/requests/packages/urllib3/contrib/appengine.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib.appengine import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/ntlmpool.py b/requests/packages/urllib3/contrib/ntlmpool.py deleted file mode 100755 index 240d6051..00000000 --- a/requests/packages/urllib3/contrib/ntlmpool.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib.ntlmpool import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/pyopenssl.py b/requests/packages/urllib3/contrib/pyopenssl.py deleted file mode 100755 index 78bea446..00000000 --- a/requests/packages/urllib3/contrib/pyopenssl.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib.pyopenssl import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/securetransport.py b/requests/packages/urllib3/contrib/securetransport.py deleted file mode 100755 index 893bb938..00000000 --- a/requests/packages/urllib3/contrib/securetransport.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib.securetransport import * \ No newline at end of file diff --git a/requests/packages/urllib3/contrib/socks.py b/requests/packages/urllib3/contrib/socks.py deleted file mode 100755 index 799a42f4..00000000 --- a/requests/packages/urllib3/contrib/socks.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.contrib.socks import * \ No newline at end of file diff --git a/requests/packages/urllib3/exceptions.py b/requests/packages/urllib3/exceptions.py deleted file mode 100755 index 0c16164d..00000000 --- a/requests/packages/urllib3/exceptions.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.exceptions import * \ No newline at end of file diff --git a/requests/packages/urllib3/fields.py b/requests/packages/urllib3/fields.py deleted file mode 100755 index 637e512c..00000000 --- a/requests/packages/urllib3/fields.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.fields import * \ No newline at end of file diff --git a/requests/packages/urllib3/filepost.py b/requests/packages/urllib3/filepost.py deleted file mode 100755 index 638c2f53..00000000 --- a/requests/packages/urllib3/filepost.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.filepost import * \ No newline at end of file diff --git a/requests/packages/urllib3/packages/__init__.py b/requests/packages/urllib3/packages/__init__.py deleted file mode 100755 index 9df645e8..00000000 --- a/requests/packages/urllib3/packages/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.packages import * \ No newline at end of file diff --git a/requests/packages/urllib3/packages/backports/__init__.py b/requests/packages/urllib3/packages/backports/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/requests/packages/urllib3/packages/backports/makefile.py b/requests/packages/urllib3/packages/backports/makefile.py deleted file mode 100755 index 3af3774d..00000000 --- a/requests/packages/urllib3/packages/backports/makefile.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.packages.backports.makefile import * \ No newline at end of file diff --git a/requests/packages/urllib3/packages/ordered_dict.py b/requests/packages/urllib3/packages/ordered_dict.py deleted file mode 100644 index 983c174d..00000000 --- a/requests/packages/urllib3/packages/ordered_dict.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.packages.ordered_dict import * \ No newline at end of file diff --git a/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py b/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py deleted file mode 100755 index 4791ae26..00000000 --- a/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.packages.ssl_match_hostname import * \ No newline at end of file diff --git a/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py b/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py deleted file mode 100755 index 15bd4f80..00000000 --- a/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.packages.ssl_match_hostname._implementation import * \ No newline at end of file diff --git a/requests/packages/urllib3/poolmanager.py b/requests/packages/urllib3/poolmanager.py deleted file mode 100755 index 4575ce71..00000000 --- a/requests/packages/urllib3/poolmanager.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.poolmanager import * \ No newline at end of file diff --git a/requests/packages/urllib3/request.py b/requests/packages/urllib3/request.py deleted file mode 100755 index a5eedddc..00000000 --- a/requests/packages/urllib3/request.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.request import * \ No newline at end of file diff --git a/requests/packages/urllib3/response.py b/requests/packages/urllib3/response.py deleted file mode 100755 index 9cf4d785..00000000 --- a/requests/packages/urllib3/response.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.response import * \ No newline at end of file diff --git a/requests/packages/urllib3/util/__init__.py b/requests/packages/urllib3/util/__init__.py deleted file mode 100755 index 146bf708..00000000 --- a/requests/packages/urllib3/util/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from urllib3.util import * \ No newline at end of file diff --git a/setup.py b/setup.py index 425188d4..6dd2cad7 100755 --- a/setup.py +++ b/setup.py @@ -35,20 +35,7 @@ if sys.argv[-1] == 'publish': os.system('twine upload dist/*') sys.exit() -packages = [ - 'requests', - 'requests.packages', - # 'requests.packages.chardet', - # 'requests.packages.chardet.cli', - # 'requests.packages.idna', - 'requests.packages.urllib3', - 'requests.packages.urllib3.packages', - 'requests.packages.urllib3.contrib', - 'requests.packages.urllib3.util', - 'requests.packages.urllib3.packages.ssl_match_hostname', - 'requests.packages.urllib3.packages.backports', - 'requests.packages.urllib3.contrib._securetransport', - ] +packages = ['requests'] requires = [ 'chardet>=3.0.2,<3.1.0',