- updated to 2.0.1

diff --git a/python-requests.spec b/python-requests.spec
index 279773e37e8a6cf21016396874608f147ee9ac19..165c3d8d37866a52ba724cff4785749bf5b3cbda 100644 (file)
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -6,12 +6,12 @@
 Summary:       HTTP library for Python
 Summary(pl.UTF-8):     Biblioteka HTTP dla Pythona
 Name:          python-%{module}
-Version:       1.2.3
+Version:       2.0.1
 Release:       1
 License:       Apache2
 Group:         Development/Languages/Python
 Source0:       https://pypi.python.org/packages/source/r/requests/%{module}-%{version}.tar.gz
-# Source0-md5: adbd3f18445f7fe5e77f65c502e264fb
+# Source0-md5: 38e61c2856d2ba2782286730241975e6
 URL:           http://python-requests.org
 Patch0:                system-charade-and-urllib3.patch
 Patch1:                system-cert.patch
@@ -83,7 +83,7 @@ najprostszych zadań. Nie powinno tak być. Nie w Pythonie.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 
 %build

diff --git a/system-charade-and-urllib3.patch b/system-charade-and-urllib3.patch
index 52ad55804eb6535392d5ff94af906f78310585d8..ae1da5dd8e803cbba83069ac636f6dc12c78fe82 100644 (file)
--- a/system-charade-and-urllib3.patch
+++ b/system-charade-and-urllib3.patch
@@ -1,32 +1,36 @@
-diff -uNr requests/adapters.py requests.new/adapters.py
---- requests/adapters.py       2013-05-20 22:10:43.000000000 +0200
-+++ requests.new/adapters.py   2013-06-26 22:46:17.947032253 +0200
-@@ -11,16 +11,16 @@
+diff -uNr requests-2.0.1.old/requests/adapters.py requests-2.0.1/requests/adapters.py
+--- requests-2.0.1.old/requests/adapters.py    2013-10-17 07:47:39.000000000 +0200
++++ requests-2.0.1/requests/adapters.py        2013-10-27 16:24:10.774338738 +0100
+@@ -11,18 +11,18 @@
  import socket
  
  from .models import Response
--from .packages.urllib3.poolmanager import PoolManager, ProxyManager
+-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 -from .packages.urllib3.response import HTTPResponse
-+from urllib3.poolmanager import PoolManager, ProxyManager
+-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)
+                     except_on_missing_scheme, 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
+ from .exceptions import ConnectionError, Timeout, SSLError, ProxyError
  from .auth import _basic_auth_str
-diff -uNr requests/compat.py requests.new/compat.py
---- requests/compat.py 2013-01-31 14:18:16.000000000 +0100
-+++ requests.new/compat.py     2013-06-26 22:48:20.473035139 +0200
+diff -uNr requests-2.0.1.old/requests/compat.py requests-2.0.1/requests/compat.py
+--- requests-2.0.1.old/requests/compat.py      2013-09-24 19:57:07.000000000 +0200
++++ requests-2.0.1/requests/compat.py  2013-10-27 16:27:43.780795495 +0100
 @@ -4,7 +4,7 @@
  pythoncompat
  """
@@ -42,32 +46,52 @@ diff -uNr requests/compat.py requests.new/compat.py
      from StringIO import StringIO
 -    from .packages.urllib3.packages.ordered_dict import OrderedDict
 +    from urllib3.packages.ordered_dict import OrderedDict
+     from httplib import IncompleteRead
  
      builtin_str = str
-     bytes = str
-diff -uNr requests/__init__.py requests.new/__init__.py
---- requests/__init__.py       2013-05-25 18:47:20.000000000 +0200
-+++ requests.new/__init__.py   2013-06-26 22:45:40.990565797 +0200
+diff -uNr requests-2.0.1.old/requests/__init__.py requests-2.0.1/requests/__init__.py
+--- requests-2.0.1.old/requests/__init__.py    2013-10-24 16:29:28.000000000 +0200
++++ requests-2.0.1/requests/__init__.py        2013-10-27 16:23:41.876333489 +0100
 @@ -50,7 +50,7 @@
  
  # Attempt to enable urllib3's SNI support, if possible
  try:
--    from requests.packages.urllib3.contrib import pyopenssl
+-    from .packages.urllib3.contrib import pyopenssl
 +    from urllib3.contrib import pyopenssl
      pyopenssl.inject_into_urllib3()
  except ImportError:
      pass
-diff -uNr requests/models.py requests.new/models.py
---- requests/models.py 2013-05-25 18:47:00.000000000 +0200
-+++ requests.new/models.py     2013-06-26 22:47:26.743326218 +0200
-@@ -17,8 +17,8 @@
+diff -uNr requests-2.0.1.old/requests/models.py requests-2.0.1/requests/models.py
+--- requests-2.0.1.old/requests/models.py      2013-10-24 14:08:41.000000000 +0200
++++ requests-2.0.1/requests/models.py  2013-10-27 16:25:04.556830261 +0100
+@@ -17,9 +17,9 @@
  
  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 urllib3.fields import RequestField
 +from urllib3.filepost import encode_multipart_formdata
 +from urllib3.util import parse_url
- from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
- from .utils import (
-     guess_filename, get_auth_from_url, requote_uri,
+ from .exceptions import (
+     HTTPError, RequestException, MissingSchema, InvalidURL,
+     ChunkedEncodingError)
+diff -uNr requests-2.0.1.old/setup.py requests-2.0.1/setup.py
+--- requests-2.0.1.old/setup.py        2013-09-24 19:57:07.000000000 +0200
++++ requests-2.0.1/setup.py    2013-10-27 16:22:57.664285747 +0100
+@@ -15,13 +15,7 @@
+     sys.exit()
+ 
+ packages = [
+-    'requests',
+-    'requests.packages',
+-    'requests.packages.charade',
+-    'requests.packages.urllib3',
+-    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.contrib',
+-    'requests.packages.urllib3.packages.ssl_match_hostname'
++    'requests'
+ ]
+ 
+ requires = []