void-packages/srcpkgs/python-requests/patches/unbundle.patch

139 lines
5.2 KiB
Diff

diff -Nur MANIFEST.in MANIFEST.in
--- MANIFEST.in 2014-01-24 21:37:17.000000000 +0100
+++ MANIFEST.in 2014-07-07 09:55:01.317963805 +0200
@@ -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-05-16 19:55:34.000000000 +0200
+++ requests/__init__.py 2014-07-07 09:48:55.457975614 +0200
@@ -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-05-16 19:44:21.000000000 +0200
+++ requests/adapters.py 2014-07-07 09:49:45.131974011 +0200
@@ -11,18 +11,18 @@
import socket
from .models import Response
-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.poolmanager import PoolManager, proxy_from_url
+from urllib3.response import HTTPResponse
+from urllib3.util import Timeout as TimeoutSauce
from .compat import urlparse, basestring, urldefrag, unquote
from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
prepend_scheme_if_needed, get_auth_from_url)
from .structures import CaseInsensitiveDict
-from .packages.urllib3.exceptions import MaxRetryError
-from .packages.urllib3.exceptions import TimeoutError
-from .packages.urllib3.exceptions import SSLError as _SSLError
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
-from .packages.urllib3.exceptions import ProxyError as _ProxyError
+from urllib3.exceptions import MaxRetryError
+from urllib3.exceptions import TimeoutError
+from urllib3.exceptions import SSLError as _SSLError
+from urllib3.exceptions import HTTPError as _HTTPError
+from urllib3.exceptions import ProxyError as _ProxyError
from .cookies import extract_cookies_to_jar
from .exceptions import ConnectionError, Timeout, SSLError, ProxyError
from .auth import _basic_auth_str
diff -Nur requests/certs.py requests/certs.py
--- requests/certs.py 2014-01-24 21:37:17.000000000 +0100
+++ requests/certs.py 2014-07-07 09:51:32.678970539 +0200
@@ -17,8 +17,7 @@
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-01-24 21:37:17.000000000 +0100
+++ requests/compat.py 2014-07-07 09:50:29.140972590 +0200
@@ -4,7 +4,7 @@
pythoncompat
"""
-from .packages import chardet
+import chardet
import sys
@@ -89,7 +89,7 @@
import cookielib
from Cookie import Morsel
from StringIO import StringIO
- from .packages.urllib3.packages.ordered_dict import OrderedDict
+ from collections import OrderedDict
from httplib import IncompleteRead
builtin_str = str
diff -Nur requests/exceptions.py requests/exceptions.py
--- requests/exceptions.py 2014-03-24 16:39:20.000000000 +0100
+++ requests/exceptions.py 2014-07-07 09:51:09.190971298 +0200
@@ -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-05-12 21:08:50.000000000 +0200
+++ requests/models.py 2014-07-07 09:50:55.757971731 +0200
@@ -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 DecodeError
+from urllib3.fields import RequestField
+from urllib3.filepost import encode_multipart_formdata
+from urllib3.util import parse_url
+from urllib3.exceptions import DecodeError
from .exceptions import (
HTTPError, RequestException, MissingSchema, InvalidURL,
ChunkedEncodingError, ContentDecodingError)
diff -Nur setup.py setup.py
--- setup.py 2014-05-12 21:08:50.000000000 +0200
+++ setup.py 2014-07-07 09:48:16.640976867 +0200
@@ -16,13 +16,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 = []
@@ -41,7 +34,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,