diff -Nur MANIFEST.in MANIFEST.in --- MANIFEST.in 2014-01-24 21:37:17.000000000 +0100 +++ MANIFEST.in 2014-10-29 12:24:04.411052117 +0100 @@ -1 +1 @@ -include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem +include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt diff -Nur requests/__init__.py requests/__init__.py --- requests/__init__.py 2014-10-06 11:44:17.000000000 +0200 +++ requests/__init__.py 2014-10-29 12:05:46.197769171 +0100 @@ -50,7 +50,7 @@ # Attempt to enable urllib3's SNI support, if possible try: - from .packages.urllib3.contrib import pyopenssl + from urllib3.contrib import pyopenssl pyopenssl.inject_into_urllib3() except ImportError: pass diff -Nur requests/adapters.py requests/adapters.py --- requests/adapters.py 2014-10-06 11:40:10.000000000 +0200 +++ requests/adapters.py 2014-10-29 12:01:35.562902538 +0100 @@ -11,21 +11,21 @@ import socket from .models import Response -from .packages.urllib3 import Retry -from .packages.urllib3.poolmanager import PoolManager, proxy_from_url -from .packages.urllib3.response import HTTPResponse -from .packages.urllib3.util import Timeout as TimeoutSauce +from urllib3 import Retry +from urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse +from urllib3.util import Timeout as TimeoutSauce from .compat import urlparse, basestring from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, prepend_scheme_if_needed, get_auth_from_url, urldefragauth) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import ConnectTimeoutError -from .packages.urllib3.exceptions import HTTPError as _HTTPError -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import ProxyError as _ProxyError -from .packages.urllib3.exceptions import ProtocolError -from .packages.urllib3.exceptions import ReadTimeoutError -from .packages.urllib3.exceptions import SSLError as _SSLError +from urllib3.exceptions import ConnectTimeoutError +from urllib3.exceptions import HTTPError as _HTTPError +from urllib3.exceptions import MaxRetryError +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 .cookies import extract_cookies_to_jar from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError, ProxyError) diff -Nur requests/certs.py requests/certs.py --- requests/certs.py 2014-08-19 18:52:58.000000000 +0200 +++ requests/certs.py 2014-10-29 11:59:21.455579110 +0100 @@ -18,8 +18,7 @@ except ImportError: def where(): """Return the preferred certificate bundle.""" - # vendored bundle inside Requests - return os.path.join(os.path.dirname(__file__), 'cacert.pem') + return '/etc/ssl/certs/ca-certificates.crt' if __name__ == '__main__': print(where()) diff -Nur requests/compat.py requests/compat.py --- requests/compat.py 2014-08-19 18:52:58.000000000 +0200 +++ requests/compat.py 2014-10-29 12:03:06.340767658 +0100 @@ -4,7 +4,7 @@ pythoncompat """ -from .packages import chardet +import chardet import sys @@ -91,7 +91,7 @@ import cookielib from Cookie import Morsel from StringIO import StringIO - from .packages.urllib3.packages.ordered_dict import OrderedDict + from collections import OrderedDict builtin_str = str bytes = str diff -Nur requests/exceptions.py requests/exceptions.py --- requests/exceptions.py 2014-10-05 18:53:35.000000000 +0200 +++ requests/exceptions.py 2014-10-29 12:06:03.354554681 +0100 @@ -7,7 +7,7 @@ This module contains the set of Requests' exceptions. """ -from .packages.urllib3.exceptions import HTTPError as BaseHTTPError +from urllib3.exceptions import HTTPError as BaseHTTPError class RequestException(IOError): diff -Nur requests/models.py requests/models.py --- requests/models.py 2014-10-06 11:40:10.000000000 +0200 +++ requests/models.py 2014-10-29 12:05:02.911310326 +0100 @@ -16,10 +16,10 @@ from .auth import HTTPBasicAuth from .cookies import cookiejar_from_dict, get_cookie_header -from .packages.urllib3.fields import RequestField -from .packages.urllib3.filepost import encode_multipart_formdata -from .packages.urllib3.util import parse_url -from .packages.urllib3.exceptions import ( +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) from .exceptions import ( HTTPError, RequestException, MissingSchema, InvalidURL, diff -Nur setup.py setup.py --- setup.py 2014-09-09 18:31:17.000000000 +0200 +++ setup.py 2014-10-29 12:15:22.150568770 +0100 @@ -18,13 +18,6 @@ packages = [ 'requests', - 'requests.packages', - 'requests.packages.chardet', - 'requests.packages.urllib3', - 'requests.packages.urllib3.packages', - 'requests.packages.urllib3.contrib', - 'requests.packages.urllib3.util', - 'requests.packages.urllib3.packages.ssl_match_hostname', ] requires = [] @@ -43,7 +36,7 @@ author_email='me@kennethreitz.com', url='http://python-requests.org', packages=packages, - package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']}, + package_data={'': ['LICENSE', 'NOTICE'],}, package_dir={'requests': 'requests'}, include_package_data=True, install_requires=requires,