diff --git a/no-default-cacert-sles.patch b/no-default-cacert-sles.patch index 438b782..a4ddceb 100644 --- a/no-default-cacert-sles.patch +++ b/no-default-cacert-sles.patch @@ -23,12 +23,12 @@ Index: requests-1.1.0/requests/certs.py =================================================================== --- requests-1.1.0.orig/requests/certs.py +++ requests-1.1.0/requests/certs.py -@@ -18,7 +18,7 @@ def where(): - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return None +@@ -19,7 +19,7 @@ + def where(): + """Return the preferred certificate bundle.""" + # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ return None if __name__ == '__main__': print(where()) diff --git a/no-default-cacert.patch b/no-default-cacert.patch index 63f29d0..9a1ce6f 100644 --- a/no-default-cacert.patch +++ b/no-default-cacert.patch @@ -12,12 +12,12 @@ else: --- a/requests/certs.py +++ b/requests/certs.py -@@ -18,7 +18,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/' +@@ -19,7 +19,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/' if __name__ == '__main__': print(where()) @@ -26,3 +26,4 @@ @@ -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 --git a/python-requests.changes b/python-requests.changes index da35788..8ccb80a 100644 --- a/python-requests.changes +++ b/python-requests.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Sep 11 12:34:42 UTC 2014 - toddrme2178@gmail.com + +- Update to 2.4.1 (2014-09-09) + - Now has a "security" package extras set, + ``$ pip install requests[security]`` + - Requests will now use Certifi if it is available. + - Capture and re-raise urllib3 ProtocolError + - Bugfix for responses that attempt to redirect to themselves + forever (wtf?). +- Update to 2.4.0 (2014-08-29) + * Behavioral Changes + - ``Connection: keep-alive`` header is now sent automatically. + * Improvements + - Support for connect timeouts! Timeout now accepts a tuple + (connect, read) which is used to set individual connect and + read timeouts. + - Allow copying of PreparedRequests without headers/cookies. + - Updated bundled urllib3 version. + - Refactored settings loading from environment + new `Session.merge_environment_settings`. + - Handle socket errors in iter_content. + ------------------------------------------------------------------- Sat Jun 14 10:56:52 UTC 2014 - tchvatal@suse.com diff --git a/python-requests.spec b/python-requests.spec index 4d276a3..f3e3fc4 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -17,7 +17,7 @@ Name: python-requests -Version: 2.3.0 +Version: 2.4.1 Release: 0 Url: http://python-requests.org Summary: Awesome Python HTTP Library That's Actually Usable @@ -32,7 +32,9 @@ Patch1: no-default-cacert-sles.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python BuildRequires: python-devel +BuildRequires: python-py BuildRequires: python-setuptools +Requires: python-py Requires: python %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} diff --git a/requests-2.3.0.tar.gz b/requests-2.3.0.tar.gz deleted file mode 100644 index f229889..0000000 --- a/requests-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c1473875d846fe563d70868acf05b1953a4472f4695b7b3566d1d978957b8fc -size 429521 diff --git a/requests-2.4.1.tar.gz b/requests-2.4.1.tar.gz new file mode 100644 index 0000000..2c6d7e3 --- /dev/null +++ b/requests-2.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35d890b0aaa6e09ec40d49361d823b998ced86cc7673a9ce70bbc4f986e13ad8 +size 436872