- up to 2.4.3

diff --git a/python-requests.spec b/python-requests.spec
index 098d8136f777346bd02a4e8f649ef8c98a63461a..e89b19e352157137f688aec9925893d57d2b5cd4 100644 (file)
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -7,13 +7,16 @@
 Summary:       HTTP library for Python 2
 Summary(pl.UTF-8):     Biblioteka HTTP dla Pythona 2
 Name:          python-%{module}
-Version:       2.4.1
-Release:       2
+Version:       2.4.3
+Release:       1
 License:       Apache2
 Group:         Development/Languages/Python
 Source0:       https://pypi.python.org/packages/source/r/requests/%{module}-%{version}.tar.gz
-# Source0-md5: 931461f761c70708c46ea65b7889da58
+# Source0-md5: 02214b3a179e445545de4b7a98d3dd17
 URL:           http://python-requests.org
+# find . -name '*.py' -exec sed -i -e 's#\.packages\.urllib3#urllib3#g' "{}" ";"
+# find . -name '*.py' -exec sed -i -e 's#from \.packages import chardet#import charade as chardet#g' "{}" ";"
+# + manual removal from setup.py
 Patch0:                system-charade-and-urllib3.patch
 Patch1:                system-cert.patch
 %if %{with python2}

diff --git a/system-charade-and-urllib3.patch b/system-charade-and-urllib3.patch
index 39799c872adc00e4f389b7646a774c9d437abaa2..8415fcc0bc91b3626e42648b97ef4505b05648a8 100644 (file)
--- a/system-charade-and-urllib3.patch
+++ b/system-charade-and-urllib3.patch
@@ -1,6 +1,6 @@
-diff -urN requests-2.4.1.org/requests/adapters.py requests-2.4.1/requests/adapters.py
---- requests-2.4.1.org/requests/adapters.py    2014-09-09 18:31:17.000000000 +0200
-+++ requests-2.4.1/requests/adapters.py        2014-09-24 15:13:26.999475101 +0200
+diff -urN requests-2.4.3.org/requests/adapters.py requests-2.4.3/requests/adapters.py
+--- requests-2.4.3.org/requests/adapters.py    2014-10-06 11:40:10.000000000 +0200
++++ requests-2.4.3/requests/adapters.py        2014-10-21 17:40:54.823464764 +0200
 @@ -11,21 +11,21 @@
  import socket
  
@@ -13,9 +13,9 @@ diff -urN requests-2.4.1.org/requests/adapters.py requests-2.4.1/requests/adapte
 +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
+ from .compat import urlparse, basestring
  from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
-                     prepend_scheme_if_needed, get_auth_from_url)
+                     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
@@ -34,9 +34,9 @@ diff -urN requests-2.4.1.org/requests/adapters.py requests-2.4.1/requests/adapte
  from .cookies import extract_cookies_to_jar
  from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
                           ProxyError)
-diff -urN requests-2.4.1.org/requests/compat.py requests-2.4.1/requests/compat.py
---- requests-2.4.1.org/requests/compat.py      2014-08-19 18:52:58.000000000 +0200
-+++ requests-2.4.1/requests/compat.py  2014-09-24 15:14:24.687597504 +0200
+diff -urN requests-2.4.3.org/requests/compat.py requests-2.4.3/requests/compat.py
+--- requests-2.4.3.org/requests/compat.py      2014-08-19 18:52:58.000000000 +0200
++++ requests-2.4.3/requests/compat.py  2014-10-21 17:40:54.830131661 +0200
 @@ -4,7 +4,7 @@
  pythoncompat
  """
@@ -55,9 +55,9 @@ diff -urN requests-2.4.1.org/requests/compat.py requests-2.4.1/requests/compat.p
  
      builtin_str = str
      bytes = str
-diff -urN requests-2.4.1.org/requests/exceptions.py requests-2.4.1/requests/exceptions.py
---- requests-2.4.1.org/requests/exceptions.py  2014-09-09 18:31:17.000000000 +0200
-+++ requests-2.4.1/requests/exceptions.py      2014-09-24 15:13:27.002808518 +0200
+diff -urN requests-2.4.3.org/requests/exceptions.py requests-2.4.3/requests/exceptions.py
+--- requests-2.4.3.org/requests/exceptions.py  2014-10-05 18:53:35.000000000 +0200
++++ requests-2.4.3/requests/exceptions.py      2014-10-21 17:40:54.836798554 +0200
 @@ -7,7 +7,7 @@
  This module contains the set of Requests' exceptions.
  
@@ -67,9 +67,9 @@ diff -urN requests-2.4.1.org/requests/exceptions.py requests-2.4.1/requests/exce
  
  
  class RequestException(IOError):
-diff -urN requests-2.4.1.org/requests/__init__.py requests-2.4.1/requests/__init__.py
---- requests-2.4.1.org/requests/__init__.py    2014-09-09 18:34:25.000000000 +0200
-+++ requests-2.4.1/requests/__init__.py        2014-09-24 15:13:27.002808518 +0200
+diff -urN requests-2.4.3.org/requests/__init__.py requests-2.4.3/requests/__init__.py
+--- requests-2.4.3.org/requests/__init__.py    2014-10-06 11:44:17.000000000 +0200
++++ requests-2.4.3/requests/__init__.py        2014-10-21 17:40:54.820131316 +0200
 @@ -50,7 +50,7 @@
  
  # Attempt to enable urllib3's SNI support, if possible
@@ -79,9 +79,9 @@ diff -urN requests-2.4.1.org/requests/__init__.py requests-2.4.1/requests/__init
      pyopenssl.inject_into_urllib3()
  except ImportError:
      pass
-diff -urN requests-2.4.1.org/requests/models.py requests-2.4.1/requests/models.py
---- requests-2.4.1.org/requests/models.py      2014-08-19 18:52:58.000000000 +0200
-+++ requests-2.4.1/requests/models.py  2014-09-24 15:13:27.002808518 +0200
+diff -urN requests-2.4.3.org/requests/models.py requests-2.4.3/requests/models.py
+--- requests-2.4.3.org/requests/models.py      2014-10-06 11:40:10.000000000 +0200
++++ requests-2.4.3/requests/models.py  2014-10-21 17:40:54.840132000 +0200
 @@ -16,10 +16,10 @@
  
  from .auth import HTTPBasicAuth
@@ -96,10 +96,10 @@ diff -urN requests-2.4.1.org/requests/models.py requests-2.4.1/requests/models.p
 +from urllib3.exceptions import (
      DecodeError, ReadTimeoutError, ProtocolError)
  from .exceptions import (
-     HTTPError, RequestException, MissingSchema, InvalidURL,
-diff -urN requests-2.4.1.org/setup.py requests-2.4.1/setup.py
---- requests-2.4.1.org/setup.py        2014-09-09 18:31:17.000000000 +0200
-+++ requests-2.4.1/setup.py    2014-09-24 15:14:43.654742562 +0200
+     HTTPError, RequestException, MissingSchema, InvalidURL, 
+diff -urN requests-2.4.3.org/setup.py requests-2.4.3/setup.py
+--- requests-2.4.3.org/setup.py        2014-09-09 18:31:17.000000000 +0200
++++ requests-2.4.3/setup.py    2014-10-21 17:41:51.558737269 +0200
 @@ -18,13 +18,6 @@
  
  packages = [