- Update to version 1.8:

* Improved url parsing in urllib3.util.parse_url (properly parse '@' in username, and blank ports like 'hostname:'). * New urllib3.connection module which contains all the HTTPConnection objects. * Several urllib3.util.Timeout-related fixes. Also changed constructor signature to a more sensible order. [Backwards incompatible] (Issues #252, #262, #263) * Use backports.ssl_match_hostname if it's installed. (Issue #274) * Added .tell() method to urllib3.response.HTTPResponse which returns the number of bytes read so far. (Issue #277) * Support for platforms without threading. (Issue #289) * Expand default-port comparison in HTTPConnectionPool.is_same_host to allow a pool with no specified port to be considered equal to to an HTTP/HTTPS url with port 80/443 explicitly provided. (Issue #305) * Improved default SSL/TLS settings to avoid vulnerabilities. (Issue #309) * Fixed urllib3.poolmanager.ProxyManager not retrying on connect errors. (Issue #310) * Disable Nagle's Algorithm on the socket for non-proxies. A subset of requests will send the entire HTTP request ~200 milliseconds faster; however, some of the resulting TCP packets will be smaller. (Issue #254) * Increased maximum number of SubjectAltNames in urllib3.contrib.pyopenssl from the default 64 to 1024 in a single certificate. (Issue #318) * Headers are now passed and stored as a custom urllib3.collections_.HTTPHeaderDict object rather than a plain dict. (Issue #329, #333) * Headers no longer lose their case on Python 3. (Issue #236) * urllib3.contrib.pyopenssl now uses the operating system's default CA certificates on inject. (Issue #332) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=3
2014-03-20 15:22:29 +00:00 · 2014-03-20 15:22:29 +00:00 · 8279a51757
commit 8279a51757
parent 35da4f23c8
7 changed files with 161 additions and 22 deletions
--- a/0001-Don-t-install-dummyserver-into-site-packages.patch
+++ b/0001-Don-t-install-dummyserver-into-site-packages.patch
@ -0,0 +1,38 @@
+From 3361f884456699c67bf4eef2eeafb14a071cc509 Mon Sep 17 00:00:00 2001
+From: Sascha Peilicke <saschpe@mailbox.org>
+Date: Thu, 20 Mar 2014 15:41:39 +0100
+Subject: [PATCH] Don't install dummyserver into site-packages
+
+It is pure example code with self-signed certificates. It pollutes the
+global site-packages spaces and is potentially dangerous (if used
+accidentally). It doesn't make sense to install it as 'package_data' or
+'date_files' either. Since it servers as an example it should be part
+of the source distribution.
+---
+ MANIFEST.in | 1 +
+ setup.py    | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index d1abae2..3f344d1 100644
+--- a/MANIFEST.in
+++ b/MANIFEST.in
+@@ -1 +1,2 @@
+ include README.rst CHANGES.rst LICENSE.txt CONTRIBUTORS.txt test-requirements.txt
+recursive-include dummyserver *.*
+diff --git a/setup.py b/setup.py
+index 392b885..84e6d5f 100644
+--- a/setup.py
+++ b/setup.py
+@@ -44,7 +44,7 @@ setup(name='urllib3',
+       author_email='andrey.petrov@shazow.net',
+       url='http://urllib3.readthedocs.org/',
+       license='MIT',
+-      packages=['urllib3', 'dummyserver',
+      packages=['urllib3',
+                 'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
+                 'urllib3.contrib',
+                 ],
+-- 
+1.9.0
+
--- a/0001-Don-t-pin-dependency-to-exact-version.patch
+++ b/0001-Don-t-pin-dependency-to-exact-version.patch
@ -0,0 +1,29 @@
+From c8ce46178f97cc765a569864302b75aaa730d590 Mon Sep 17 00:00:00 2001
+From: Sascha Peilicke <saschpe@mailbox.org>
+Date: Thu, 20 Mar 2014 15:35:51 +0100
+Subject: [PATCH] Don't pin dependency to exact version
+
+While this expresses with which versions urllib3 is tested to work with,
+almost all distros ship different package versions. To accomodate that
+(and to avoid having them to patch away these hard requirements) only
+use '>='.
+---
+ test-requirements.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 02d70f4..98de1cc 100644
+--- a/test-requirements.txt
+++ b/test-requirements.txt
+@@ -1,4 +1,4 @@
+-nose==1.3
+-mock==1.0.1
+-tornado==3.1.1
+-coverage==3.6
+nose>=1.3
+mock>=1.0.1
+tornado>=3.1.1
+coverage>=3.6
+-- 
+1.9.0
+
--- a/python-urllib3.changes
+++ b/python-urllib3.changes
@ -1,29 +1,72 @@
+-------------------------------------------------------------------
+Thu Mar 20 15:18:55 UTC 2014 - speilicke@suse.com
+
+- Update to version 1.8:
+  * Improved url parsing in urllib3.util.parse_url (properly parse '@' in
+    username, and blank ports like 'hostname:').
+  * New urllib3.connection module which contains all the HTTPConnection
+    objects.
+  * Several urllib3.util.Timeout-related fixes. Also changed constructor
+    signature to a more sensible order. [Backwards incompatible]
+    (Issues #252, #262, #263)
+  * Use backports.ssl_match_hostname if it's installed. (Issue #274)
+  * Added .tell() method to urllib3.response.HTTPResponse which
+    returns the number of bytes read so far. (Issue #277)
+  * Support for platforms without threading. (Issue #289)
+  * Expand default-port comparison in HTTPConnectionPool.is_same_host
+    to allow a pool with no specified port to be considered equal to to an
+    HTTP/HTTPS url with port 80/443 explicitly provided. (Issue #305)
+  * Improved default SSL/TLS settings to avoid vulnerabilities.
+    (Issue #309)
+  * Fixed urllib3.poolmanager.ProxyManager not retrying on connect errors.
+    (Issue #310)
+  * Disable Nagle's Algorithm on the socket for non-proxies. A subset of requests
+    will send the entire HTTP request ~200 milliseconds faster; however, some of
+    the resulting TCP packets will be smaller. (Issue #254)
+  * Increased maximum number of SubjectAltNames in urllib3.contrib.pyopenssl
+    from the default 64 to 1024 in a single certificate. (Issue #318)
+  * Headers are now passed and stored as a custom
+    urllib3.collections_.HTTPHeaderDict object rather than a plain dict.
+    (Issue #329, #333)
+  * Headers no longer lose their case on Python 3. (Issue #236)
+  * urllib3.contrib.pyopenssl now uses the operating system's default CA
+    certificates on inject. (Issue #332)
+  * Requests with retries=False will immediately raise any exceptions without
+    wrapping them in MaxRetryError. (Issue #348)
+  * Fixed open socket leak with SSL-related failures. (Issue #344, #348)
+- Run testsuite (without coverage)
+  + urllib3-test-no-coverage.patch
+- Fix superfluous dependencies and allow later version
+  + 0001-Don-t-pin-dependency-to-exact-version.patch
+- Drop dummyserver module, this really is documentation
+  + 0001-Don-t-install-dummyserver-into-site-packages.patch
+
 -------------------------------------------------------------------
 Fri Nov 15 21:32:46 UTC 2013 - p.drouand@gmail.com

 - Update to version 1.7.1
-  + Added granular timeout support with new `urllib3.util.Timeout` class.
+  + Added granular timeout support with new urllib3.util.Timeout class.
    (Issue #231)
  + Fixed Python 3.4 support. (Issue #238)
 - Changes from 1.7
  + More exceptions are now pickle-able, with tests. (Issue #174)
  + Fixed redirecting with relative URLs in Location header. (Issue #178)
-  + Support for relative urls in ``Location: ...`` header. (Issue #179)
-  + ``urllib3.response.HTTPResponse`` now inherits from ``io.IOBase`` for bonus
+  + Support for relative urls in Location: ... header. (Issue #179)
+  + urllib3.response.HTTPResponse now inherits from io.IOBase for bonus
    file-like functionality. (Issue #187)
-  + Passing ``assert_hostname=False`` when creating a HTTPSConnectionPool will
+  + Passing assert_hostname=False when creating a HTTPSConnectionPool will
    skip hostname verification for SSL connections. (Issue #194)
-  + New method ``urllib3.response.HTTPResponse.stream(...)`` which acts as a
-    generator wrapped around ``.read(...)``. (Issue #198)
+  + New method urllib3.response.HTTPResponse.stream(...) which acts as a
+    generator wrapped around .read(...). (Issue #198)
  + IPv6 url parsing enforces brackets around the hostname. (Issue #199)
  + Fixed thread race condition in
-    ``urllib3.poolmanager.PoolManager.connection_from_host(...)`` (Issue #204)
-  + ``ProxyManager`` requests now include non-default port in ``Host: ...``
+    urllib3.poolmanager.PoolManager.connection_from_host(...) (Issue #204)
+  + ProxyManager requests now include non-default port in Host: ...
    header. (Issue #217)
-  + Added HTTPS proxy support in ``ProxyManager``. (Issue #170 #139)
-  + New ``RequestField`` object can be passed to the ``fields=...`` param which
+  + Added HTTPS proxy support in ProxyManager. (Issue #170 #139)
+  + New RequestField object can be passed to the fields=... param which
    can specify headers. (Issue #220)
-  + Raise ``urllib3.exceptions.ProxyError`` when connecting to proxy fails.
+  + Raise urllib3.exceptions.ProxyError when connecting to proxy fails.
    (Issue #221)
  + Use international headers when posting file names. (Issue #119)
  + Improved IPv6 support. (Issue #203)
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@ -1,7 +1,7 @@
 #
 # spec file for package python-urllib3
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -13,25 +13,34 @@
 # published by the Open Source Initiative.

 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#


 Name:           python-urllib3
-Version:        1.7.1
+Version:        1.8
 Release:        0
-License:        MIT
 Summary:        HTTP library with thread-safe connection pooling, file post, and more
-Url:            http://urllib3.readthedocs.org/
+License:        MIT
 Group:          Development/Languages/Python
+Url:            http://urllib3.readthedocs.org/
 Source:         https://pypi.python.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM speilicke@suse.com -- https://github.com/shazow/urllib3/pull/361
+Patch0:         0001-Don-t-pin-dependency-to-exact-version.patch
+# PATCH-FIX-UPSTREAM speilicke@suse.com -- https://github.com/shazow/urllib3/pull/362
+Patch1:         0001-Don-t-install-dummyserver-into-site-packages.patch
+# PATCH-FIX-OPENSUSE speilicke@suse.com -- We need no coverage report
+Patch2:         urllib3-test-no-coverage.patch
 BuildRequires:  python-devel
+# Test requirements:
+BuildRequires:  python-mock >= 1.0.1
+BuildRequires:  python-nose >= 1.3
+BuildRequires:  python-tornado >= 3.1.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %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()")}
 %else
 BuildArch:      noarch
 %endif
-Requires:       python-coverage
-Requires:       python-tornado

 %description
 Highlights
@ -51,6 +60,9 @@ Highlights

 %prep
 %setup -q -n urllib3-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1

 %build
 python setup.py build
@ -58,9 +70,13 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}

+%check
+nosetests
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGES.rst CONTRIBUTORS.txt LICENSE.txt README.rst
-%{python_sitelib}/*
+%{python_sitelib}/urllib3
+%{python_sitelib}/urllib3-%{version}-py%{py_ver}.egg-info

-%changelog
+%changelog
--- a/urllib3-1.7.1.tar.gz
+++ b/urllib3-1.7.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20fb9e6c7127a6f7a758919f6de7ef352bb955084006f29e838045caca00cb1b
-size 67329
--- a/urllib3-1.8.tar.gz
+++ b/urllib3-1.8.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a89fa1b43d277cfadf228cc90b9c75f254818ea3a1aab7bffb0223cbb7bb15d
+size 76503
--- a/urllib3-test-no-coverage.patch
+++ b/urllib3-test-no-coverage.patch
@ -0,0 +1,13 @@
+diff -ruN a/setup.cfg b/setup.cfg
+--- a/setup.cfg	2014-03-06 01:26:02.000000000 +0100
+++ b/setup.cfg	2014-03-20 15:31:36.249495224 +0100
+@@ -1,9 +1,5 @@
+ [nosetests]
+ logging-clear-handlers = true
+-with-coverage = true
+-cover-package = urllib3
+-cover-min-percentage = 100
+-cover-erase = true
+ 
+ [egg_info]
+ tag_build =