python-requests: update to 2.5.0

srcpkgs/python-requests/patches/01_unbundle.patch

@@ -1,13 +1,15 @@
-diff -Nur MANIFEST.in MANIFEST.in
+diff --git MANIFEST.in MANIFEST.in
---- MANIFEST.in	2014-01-24 21:37:17.000000000 +0100
+index 439de49..7888aee 100644
-+++ MANIFEST.in	2014-10-29 12:24:04.411052117 +0100
+--- MANIFEST.in
++++ MANIFEST.in
 @@ -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
+diff --git requests/__init__.py requests/__init__.py
---- requests/__init__.py	2014-10-06 11:44:17.000000000 +0200
+index 22cd57d..b2939fa 100644
-+++ requests/__init__.py	2014-10-29 12:05:46.197769171 +0100
+--- requests/__init__.py
-@@ -50,7 +50,7 @@
++++ requests/__init__.py
+@@ -50,7 +50,7 @@ __copyright__ = 'Copyright 2014 Kenneth Reitz'
  
  # Attempt to enable urllib3's SNI support, if possible
  try:
@@ -16,10 +18,11 @@ diff -Nur requests/__init__.py requests/__init__.py
      pyopenssl.inject_into_urllib3()
  except ImportError:
      pass
-diff -Nur requests/adapters.py requests/adapters.py
+diff --git requests/adapters.py requests/adapters.py
---- requests/adapters.py	2014-10-06 11:40:10.000000000 +0200
+index c892853..8f5d340 100644
-+++ requests/adapters.py	2014-10-29 12:01:35.562902538 +0100
+--- requests/adapters.py
-@@ -11,21 +11,21 @@
++++ requests/adapters.py
+@@ -11,22 +11,22 @@ and maintain connections.
  import socket
  
  from .models import Response
@@ -42,6 +45,7 @@ diff -Nur requests/adapters.py requests/adapters.py
 -from .packages.urllib3.exceptions import ProtocolError
 -from .packages.urllib3.exceptions import ReadTimeoutError
 -from .packages.urllib3.exceptions import SSLError as _SSLError
+-from .packages.urllib3.exceptions import ResponseError
 +from urllib3.exceptions import ConnectTimeoutError
 +from urllib3.exceptions import HTTPError as _HTTPError
 +from urllib3.exceptions import MaxRetryError
@@ -49,13 +53,15 @@ diff -Nur requests/adapters.py requests/adapters.py
 +from urllib3.exceptions import ProtocolError
 +from urllib3.exceptions import ReadTimeoutError
 +from urllib3.exceptions import SSLError as _SSLError
++from urllib3.exceptions import ResponseError
  from .cookies import extract_cookies_to_jar
  from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
-                          ProxyError)
+                          ProxyError, RetryError)
-diff -Nur requests/certs.py requests/certs.py
+diff --git requests/certs.py requests/certs.py
---- requests/certs.py	2014-08-19 18:52:58.000000000 +0200
+index 07e6475..2f2d79b 100644
-+++ requests/certs.py	2014-10-29 11:59:21.455579110 +0100
+--- requests/certs.py
-@@ -18,8 +18,7 @@
++++ requests/certs.py
+@@ -18,8 +18,7 @@ try:
  except ImportError:
      def where():
          """Return the preferred certificate bundle."""
@@ -65,9 +71,10 @@ diff -Nur requests/certs.py requests/certs.py
  
  if __name__ == '__main__':
      print(where())
-diff -Nur requests/compat.py requests/compat.py
+diff --git requests/compat.py requests/compat.py
---- requests/compat.py	2014-08-19 18:52:58.000000000 +0200
+index be5a1ed..cf866db 100644
-+++ requests/compat.py	2014-10-29 12:03:06.340767658 +0100
+--- requests/compat.py
++++ requests/compat.py
 @@ -4,7 +4,7 @@
  pythoncompat
  """
@@ -77,7 +84,7 @@ diff -Nur requests/compat.py requests/compat.py
  
  import sys
  
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ if is_py2:
      import cookielib
      from Cookie import Morsel
      from StringIO import StringIO
@@ -86,10 +93,11 @@ diff -Nur requests/compat.py requests/compat.py
  
      builtin_str = str
      bytes = str
-diff -Nur requests/exceptions.py requests/exceptions.py
+diff --git requests/exceptions.py requests/exceptions.py
---- requests/exceptions.py	2014-10-05 18:53:35.000000000 +0200
+index 89135a8..b70c525 100644
-+++ requests/exceptions.py	2014-10-29 12:06:03.354554681 +0100
+--- requests/exceptions.py
-@@ -7,7 +7,7 @@
++++ requests/exceptions.py
+@@ -7,7 +7,7 @@ requests.exceptions
  This module contains the set of Requests' exceptions.
  
  """
@@ -98,10 +106,11 @@ diff -Nur requests/exceptions.py requests/exceptions.py
  
  
  class RequestException(IOError):
-diff -Nur requests/models.py requests/models.py
+diff --git requests/models.py requests/models.py
---- requests/models.py	2014-10-06 11:40:10.000000000 +0200
+index 2370b67..2fa653a 100644
-+++ requests/models.py	2014-10-29 12:05:02.911310326 +0100
+--- requests/models.py
-@@ -16,10 +16,10 @@
++++ requests/models.py
+@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveDict
  
  from .auth import HTTPBasicAuth
  from .cookies import cookiejar_from_dict, get_cookie_header
@@ -116,10 +125,24 @@ diff -Nur requests/models.py requests/models.py
      DecodeError, ReadTimeoutError, ProtocolError)
  from .exceptions import (
      HTTPError, RequestException, MissingSchema, InvalidURL, 
-diff -Nur setup.py setup.py
+diff --git requests/sessions.py requests/sessions.py
---- setup.py	2014-09-09 18:31:17.000000000 +0200
+index 4f30696..03a3c36 100644
-+++ setup.py	2014-10-29 12:15:22.150568770 +0100
+--- requests/sessions.py
-@@ -18,13 +18,6 @@
++++ requests/sessions.py
+@@ -21,7 +21,7 @@ from .hooks import default_hooks, dispatch_hook
+ from .utils import to_key_val_list, default_headers, to_native_string
+ from .exceptions import (
+     TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
+-from .packages.urllib3._collections import RecentlyUsedContainer
++from urllib3._collections import RecentlyUsedContainer
+ from .structures import CaseInsensitiveDict
+ 
+ from .adapters import HTTPAdapter
+diff --git setup.py setup.py
+index 813fc87..6eac79f 100755
+--- setup.py
++++ setup.py
+@@ -18,13 +18,6 @@ if sys.argv[-1] == 'publish':
  
  packages = [
      'requests',
@@ -133,7 +156,7 @@ diff -Nur setup.py setup.py
  ]
  
  requires = []
-@@ -43,7 +36,7 @@
+@@ -43,7 +36,7 @@ setup(
      author_email='me@kennethreitz.com',
      url='http://python-requests.org',
      packages=packages,
@@ -142,3 +165,4 @@ diff -Nur setup.py setup.py
      package_dir={'requests': 'requests'},
      include_package_data=True,
      install_requires=requires,
+

srcpkgs/python-requests/template

@@ -1,7 +1,7 @@
 # Template file for 'python-requests'
 pkgname=python-requests
-version=2.4.3
+version=2.5.0
-revision=2
+revision=1
 noarch=yes
 wrksrc="requests-${version}"
 build_style="python-module"
@@ -17,7 +17,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://docs.python-requests.org/en/latest/"
 license="Apache-2.0"
 distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz"
-checksum=53c68313c5c6149b1a899234c000296e60a8900682accf73d6f0c6d608afc6b1
+checksum=d2daef4919fc87262b8b3cb5a9d214cac8ce1e50950f8423bbc1d31c2e63d38e
 
 pre_build() {
 	rm -rf requests.egg-info