commit python-urllib3 for openSUSE:Factory

1 Feb 2021

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-urllib3 for openSUSE:Factory checked in at 2021-02-01 13:27:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-urllib3 (Old)
 and      /work/SRC/openSUSE:Factory/.python-urllib3.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-urllib3"

Mon Feb  1 13:27:03 2021 rev:44 rq:867599 version:1.26.3

Changes:
--------

--- /work/SRC/openSUSE:Factory/python-urllib3/python-urllib3.changes	2021-01-02 21:30:26.399402563 +0100
+++ /work/SRC/openSUSE:Factory/.python-urllib3.new.28504/python-urllib3.changes	2021-02-01 13:28:41.450148579 +0100
@@ -1,0 +2,9 @@
+Thu Jan 28 23:20:46 UTC 2021 - Dirk M��ller <dmueller@suse.com>
+
+- update to 1.26.3:
+  * Fixed bytes and string comparison issue with headers (Pull #2141)
+  * Changed ``ProxySchemeUnknown`` error message to be
+    more actionable if the user supplies a proxy URL without
+    a scheme. (Pull #2107)
+
+-------------------------------------------------------------------

Old:
----
  urllib3-1.26.2.tar.gz

New:
----
  urllib3-1.26.3.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-urllib3.spec ++++++
--- /var/tmp/diff_new_pack.8EhkbR/_old	2021-02-01 13:28:42.346149973 +0100
+++ /var/tmp/diff_new_pack.8EhkbR/_new	2021-02-01 13:28:42.346149973 +0100
@@ -27,7 +27,7 @@
 %bcond_with test
 %endif
 Name:           python-urllib3%{psuffix}
-Version:        1.26.2
+Version:        1.26.3
 Release:        0
 Summary:        HTTP library with thread-safe connection pooling, file post, and more
 License:        MIT

++++++ remove_mock.patch ++++++
--- /var/tmp/diff_new_pack.8EhkbR/_old	2021-02-01 13:28:42.386150035 +0100
+++ /var/tmp/diff_new_pack.8EhkbR/_new	2021-02-01 13:28:42.390150042 +0100
@@ -1,5 +1,7 @@
---- a/docs/conf.py
-+++ b/docs/conf.py
+Index: urllib3-1.26.3/docs/conf.py
+===================================================================
+--- urllib3-1.26.3.orig/docs/conf.py
++++ urllib3-1.26.3/docs/conf.py
 @@ -14,7 +14,10 @@ sys.path.insert(0, root_path)
  # Mock some expensive/platform-specific modules so build will work.
  # (https://read-the-docs.readthedocs.io/en/latest/faq.html#\
@@ -12,17 +14,10 @@
  
  
  class MockModule(mock.Mock):
-@@ -77,7 +80,7 @@ html_logo = "images/banner.svg"
- 
- html_theme_options = {
-     "announcement": """
--        <a style=\"text-decoration: none; color: white;\" 
-+        <a style=\"text-decoration: none; color: white;\"
-            href=\"https://opencollective.com/urllib3\">
-            <img src=\"/en/latest/_static/favicon.png\"/> Sponsor urllib3 v2.0 on Open Collective
-         </a>
---- a/test/appengine/test_urlfetch.py
-+++ b/test/appengine/test_urlfetch.py
+Index: urllib3-1.26.3/test/appengine/test_urlfetch.py
+===================================================================
+--- urllib3-1.26.3.orig/test/appengine/test_urlfetch.py
++++ urllib3-1.26.3/test/appengine/test_urlfetch.py
 @@ -5,7 +5,10 @@ Engine-patched version of httplib to mak
  import httplib
  import pytest
@@ -35,8 +30,10 @@
  
  from ..test_no_ssl import TestWithoutSSL
  
---- a/test/contrib/test_pyopenssl.py
-+++ b/test/contrib/test_pyopenssl.py
+Index: urllib3-1.26.3/test/contrib/test_pyopenssl.py
+===================================================================
+--- urllib3-1.26.3.orig/test/contrib/test_pyopenssl.py
++++ urllib3-1.26.3/test/contrib/test_pyopenssl.py
 @@ -1,7 +1,10 @@
  # -*- coding: utf-8 -*-
  import os
@@ -49,8 +46,10 @@
  import pytest
  
  try:
---- a/test/contrib/test_pyopenssl_dependencies.py
-+++ b/test/contrib/test_pyopenssl_dependencies.py
+Index: urllib3-1.26.3/test/contrib/test_pyopenssl_dependencies.py
+===================================================================
+--- urllib3-1.26.3.orig/test/contrib/test_pyopenssl_dependencies.py
++++ urllib3-1.26.3/test/contrib/test_pyopenssl_dependencies.py
 @@ -1,6 +1,9 @@
  # -*- coding: utf-8 -*-
  import pytest
@@ -62,8 +61,10 @@
  
  try:
      from urllib3.contrib.pyopenssl import extract_from_urllib3, inject_into_urllib3
---- a/test/test_connection.py
-+++ b/test/test_connection.py
+Index: urllib3-1.26.3/test/test_connection.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_connection.py
++++ urllib3-1.26.3/test/test_connection.py
 @@ -1,6 +1,9 @@
  import datetime
  
@@ -75,8 +76,10 @@
  import pytest
  
  from urllib3.connection import RECENT_DATE, CertificateError, _match_hostname
---- a/test/test_connectionpool.py
-+++ b/test/test_connectionpool.py
+Index: urllib3-1.26.3/test/test_connectionpool.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_connectionpool.py
++++ urllib3-1.26.3/test/test_connectionpool.py
 @@ -6,7 +6,10 @@ from ssl import SSLError as BaseSSLError
  from test import SHORT_TIMEOUT
  
@@ -89,8 +92,10 @@
  
  from dummyserver.server import DEFAULT_CA
  from urllib3._collections import HTTPHeaderDict
---- a/test/test_queue_monkeypatch.py
-+++ b/test/test_queue_monkeypatch.py
+Index: urllib3-1.26.3/test/test_queue_monkeypatch.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_queue_monkeypatch.py
++++ urllib3-1.26.3/test/test_queue_monkeypatch.py
 @@ -1,6 +1,9 @@
  from __future__ import absolute_import
  
@@ -102,8 +107,10 @@
  import pytest
  
  from urllib3 import HTTPConnectionPool
---- a/test/test_response.py
-+++ b/test/test_response.py
+Index: urllib3-1.26.3/test/test_response.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_response.py
++++ urllib3-1.26.3/test/test_response.py
 @@ -9,7 +9,10 @@ from base64 import b64decode
  from io import BufferedReader, BytesIO, TextIOWrapper
  from test import onlyBrotlipy
@@ -116,8 +123,10 @@
  import pytest
  import six
  
---- a/test/test_retry.py
-+++ b/test/test_retry.py
+Index: urllib3-1.26.3/test/test_retry.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_retry.py
++++ urllib3-1.26.3/test/test_retry.py
 @@ -1,6 +1,9 @@
  import warnings
  
@@ -129,8 +138,10 @@
  import pytest
  
  from urllib3.exceptions import (
---- a/test/test_retry_deprecated.py
-+++ b/test/test_retry_deprecated.py
+Index: urllib3-1.26.3/test/test_retry_deprecated.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_retry_deprecated.py
++++ urllib3-1.26.3/test/test_retry_deprecated.py
 @@ -1,7 +1,10 @@
  # This is a copy-paste of test_retry.py with extra asserts about deprecated options. It will be removed for v2.
  import warnings
@@ -143,8 +154,10 @@
  import pytest
  
  from urllib3.exceptions import (
---- a/test/test_ssl.py
-+++ b/test/test_ssl.py
+Index: urllib3-1.26.3/test/test_ssl.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_ssl.py
++++ urllib3-1.26.3/test/test_ssl.py
 @@ -1,6 +1,9 @@
  from test import notPyPy2
  
@@ -156,8 +169,10 @@
  import pytest
  
  from urllib3.exceptions import SNIMissingWarning
---- a/test/test_ssltransport.py
-+++ b/test/test_ssltransport.py
+Index: urllib3-1.26.3/test/test_ssltransport.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_ssltransport.py
++++ urllib3-1.26.3/test/test_ssltransport.py
 @@ -4,7 +4,10 @@ import socket
  import ssl
  import sys
@@ -170,8 +185,10 @@
  import pytest
  
  from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS
---- a/test/test_util.py
-+++ b/test/test_util.py
+Index: urllib3-1.26.3/test/test_util.py
+===================================================================
+--- urllib3-1.26.3.orig/test/test_util.py
++++ urllib3-1.26.3/test/test_util.py
 @@ -9,7 +9,10 @@ from itertools import chain
  from test import notBrotlipy, onlyBrotlipy, onlyPy2, onlyPy3
  
@@ -184,8 +201,10 @@
  
  from urllib3 import add_stderr_logger, disable_warnings, util
  from urllib3.exceptions import (
---- a/test/with_dummyserver/test_connectionpool.py
-+++ b/test/with_dummyserver/test_connectionpool.py
+Index: urllib3-1.26.3/test/with_dummyserver/test_connectionpool.py
+===================================================================
+--- urllib3-1.26.3.orig/test/with_dummyserver/test_connectionpool.py
++++ urllib3-1.26.3/test/with_dummyserver/test_connectionpool.py
 @@ -10,7 +10,10 @@ import warnings
  from test import LONG_TIMEOUT, SHORT_TIMEOUT, onlyPy2
  from threading import Event
@@ -198,8 +217,10 @@
  import pytest
  import six
  
---- a/test/with_dummyserver/test_https.py
-+++ b/test/with_dummyserver/test_https.py
+Index: urllib3-1.26.3/test/with_dummyserver/test_https.py
+===================================================================
+--- urllib3-1.26.3.orig/test/with_dummyserver/test_https.py
++++ urllib3-1.26.3/test/with_dummyserver/test_https.py
 @@ -19,7 +19,10 @@ from test import (
      resolvesLocalhostFQDN,
  )
@@ -212,8 +233,10 @@
  import pytest
  import trustme
  
---- a/test/with_dummyserver/test_socketlevel.py
-+++ b/test/with_dummyserver/test_socketlevel.py
+Index: urllib3-1.26.3/test/with_dummyserver/test_socketlevel.py
+===================================================================
+--- urllib3-1.26.3.orig/test/with_dummyserver/test_socketlevel.py
++++ urllib3-1.26.3/test/with_dummyserver/test_socketlevel.py
 @@ -52,7 +52,10 @@ from test import (
  )
  from threading import Event

++++++ urllib3-1.26.2.tar.gz -> urllib3-1.26.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/CHANGES.rst new/urllib3-1.26.3/CHANGES.rst
--- old/urllib3-1.26.2/CHANGES.rst	2020-11-12 23:16:30.000000000 +0100
+++ new/urllib3-1.26.3/CHANGES.rst	2021-01-26 19:57:14.000000000 +0100
@@ -1,6 +1,16 @@
 Changes
 =======
 
+1.26.3 (2021-01-26)
+-------------------
+
+* Fixed bytes and string comparison issue with headers (Pull #2141)
+
+* Changed ``ProxySchemeUnknown`` error message to be
+  more actionable if the user supplies a proxy URL without
+  a scheme. (Pull #2107)
+
+
 1.26.2 (2020-11-12)
 -------------------
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/PKG-INFO new/urllib3-1.26.3/PKG-INFO
--- old/urllib3-1.26.2/PKG-INFO	2020-11-12 23:16:39.000000000 +0100
+++ new/urllib3-1.26.3/PKG-INFO	2021-01-26 19:57:39.199241600 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urllib3
-Version: 1.26.2
+Version: 1.26.3
 Summary: HTTP library with thread-safe connection pooling, file post, and more.
 Home-page: https://urllib3.readthedocs.io/
 Author: Andrey Petrov
@@ -116,6 +116,16 @@
         Changes
         =======
         
+        1.26.3 (2021-01-26)
+        -------------------
+        
+        * Fixed bytes and string comparison issue with headers (Pull #2141)
+        
+        * Changed ``ProxySchemeUnknown`` error message to be
+          more actionable if the user supplies a proxy URL without
+          a scheme. (Pull #2107)
+        
+        
         1.26.2 (2020-11-12)
         -------------------
         
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/docs/conf.py new/urllib3-1.26.3/docs/conf.py
--- old/urllib3-1.26.2/docs/conf.py	2020-11-12 23:16:30.000000000 +0100
+++ new/urllib3-1.26.3/docs/conf.py	2021-01-26 19:57:14.000000000 +0100
@@ -78,8 +78,8 @@
 html_theme_options = {
     "announcement": """
         <a style=\"text-decoration: none; color: white;\" 
-           href=\"https://opencollective.com/urllib3\">
-           <img src=\"/en/latest/_static/favicon.png\"/> Sponsor urllib3 v2.0 on Open Collective
+           href=\"https://github.com/sponsors/urllib3\">
+           <img src=\"/en/latest/_static/favicon.png\"/> Support urllib3 on GitHub Sponsors
         </a>
     """,
     "sidebar_hide_name": True,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/docs/sponsors.rst new/urllib3-1.26.3/docs/sponsors.rst
--- old/urllib3-1.26.2/docs/sponsors.rst	2020-11-12 23:16:30.000000000 +0100
+++ new/urllib3-1.26.3/docs/sponsors.rst	2021-01-26 19:56:40.000000000 +0100
@@ -15,7 +15,7 @@
 
    `Get in contact <mailto:sethmichaellarson@gmail.com>`_ for additional
    details on sponsorship and perks before making a contribution
-   through `Open Collective <https://opencollective.com/urllib3>`_ if you have questions.
+   through `GitHub Sponsors <https://github.com/sponsors/urllib3>`_ if you have questions.
 
 
 Silver v2.0 Sponsor Perks
@@ -76,12 +76,3 @@
   `@Lukasa <https://github.com/Lukasa>`_
 
 * `Stripe <https://stripe.com>`_ (June 23, 2014)
-
-
-Open Collective Supporters
---------------------------
-
-All donations are currently going towards the development of new features for urllib3 v2.0.
-Donate $5 or more as an individual or $50 or more as an organization to be added to the list of supporters below (coming soon).
-
-`Thanks to all our supporters on Open Collective <https://opencollective.com/urllib3#section-contributors>`_!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/docs/v2-roadmap.rst new/urllib3-1.26.3/docs/v2-roadmap.rst
--- old/urllib3-1.26.2/docs/v2-roadmap.rst	2020-11-12 23:16:30.000000000 +0100
+++ new/urllib3-1.26.3/docs/v2-roadmap.rst	2021-01-26 19:56:40.000000000 +0100
@@ -3,7 +3,7 @@
 
 .. important::
 
-   We're seeking `sponsors and supporters for urllib3 v2.0 on Open Collective <https://opencollective.com/urllib3>`_.
+   We're seeking `sponsors and supporters for urllib3 v2.0 on Open Collective <https://github.com/sponsors/urllib3>`_.
    There's a lot of work to be done for our small team and we want to make sure
    development can get completed on-time while also fairly compensating contributors
    for the additional effort required for a large release like ``v2.0``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/src/urllib3/_version.py new/urllib3-1.26.3/src/urllib3/_version.py
--- old/urllib3-1.26.2/src/urllib3/_version.py	2020-11-12 23:16:34.000000000 +0100
+++ new/urllib3-1.26.3/src/urllib3/_version.py	2021-01-26 19:57:14.000000000 +0100
@@ -1,2 +1,2 @@
 # This file is protected via CODEOWNERS
-__version__ = "1.26.2"
+__version__ = "1.26.3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/src/urllib3/connection.py new/urllib3-1.26.3/src/urllib3/connection.py
--- old/urllib3-1.26.2/src/urllib3/connection.py	2020-11-12 23:16:34.000000000 +0100
+++ new/urllib3-1.26.3/src/urllib3/connection.py	2021-01-26 19:57:14.000000000 +0100
@@ -67,7 +67,7 @@
 
 # When it comes time to update this value as a part of regular maintenance
 # (ie test_recent_date is failing) update it to ~6 months before the current date.
-RECENT_DATE = datetime.date(2019, 1, 1)
+RECENT_DATE = datetime.date(2020, 7, 1)
 
 _CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
 
@@ -215,7 +215,7 @@
 
     def putheader(self, header, *values):
         """"""
-        if SKIP_HEADER not in values:
+        if not any(isinstance(v, str) and v == SKIP_HEADER for v in values):
             _HTTPConnection.putheader(self, header, *values)
         elif six.ensure_str(header.lower()) not in SKIPPABLE_HEADERS:
             raise ValueError(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/src/urllib3/exceptions.py new/urllib3-1.26.3/src/urllib3/exceptions.py
--- old/urllib3-1.26.2/src/urllib3/exceptions.py	2020-11-12 23:16:30.000000000 +0100
+++ new/urllib3-1.26.3/src/urllib3/exceptions.py	2021-01-26 19:57:14.000000000 +0100
@@ -289,7 +289,17 @@
     # TODO(t-8ch): Stop inheriting from AssertionError in v2.0.
 
     def __init__(self, scheme):
-        message = "Not supported proxy scheme %s" % scheme
+        # 'localhost' is here because our URL parser parses
+        # localhost:8080 -> scheme=localhost, remove if we fix this.
+        if scheme == "localhost":
+            scheme = None
+        if scheme is None:
+            message = "Proxy URL had no scheme, should start with http:// or https://"
+        else:
+            message = (
+                "Proxy URL had unsupported scheme %s, should use http:// or https://"
+                % scheme
+            )
         super(ProxySchemeUnknown, self).__init__(message)
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/src/urllib3.egg-info/PKG-INFO new/urllib3-1.26.3/src/urllib3.egg-info/PKG-INFO
--- old/urllib3-1.26.2/src/urllib3.egg-info/PKG-INFO	2020-11-12 23:16:39.000000000 +0100
+++ new/urllib3-1.26.3/src/urllib3.egg-info/PKG-INFO	2021-01-26 19:57:39.000000000 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: urllib3
-Version: 1.26.2
+Version: 1.26.3
 Summary: HTTP library with thread-safe connection pooling, file post, and more.
 Home-page: https://urllib3.readthedocs.io/
 Author: Andrey Petrov
@@ -116,6 +116,16 @@
         Changes
         =======
         
+        1.26.3 (2021-01-26)
+        -------------------
+        
+        * Fixed bytes and string comparison issue with headers (Pull #2141)
+        
+        * Changed ``ProxySchemeUnknown`` error message to be
+          more actionable if the user supplies a proxy URL without
+          a scheme. (Pull #2107)
+        
+        
         1.26.2 (2020-11-12)
         -------------------
         
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.26.2/test/with_dummyserver/test_proxy_poolmanager.py new/urllib3-1.26.3/test/with_dummyserver/test_proxy_poolmanager.py
--- old/urllib3-1.26.2/test/with_dummyserver/test_proxy_poolmanager.py	2020-11-12 23:16:30.000000000 +0100
+++ new/urllib3-1.26.3/test/with_dummyserver/test_proxy_poolmanager.py	2021-01-26 19:57:14.000000000 +0100
@@ -23,6 +23,7 @@
     ConnectTimeoutError,
     MaxRetryError,
     ProxyError,
+    ProxySchemeUnknown,
     ProxySchemeUnsupported,
     SSLError,
 )
@@ -502,6 +503,27 @@
             r = http.request("GET", "%s/" % self.https_url.upper())
             assert r.status == 200
 
+    @pytest.mark.parametrize(
+        "url, error_msg",
+        [
+            (
+                "127.0.0.1",
+                "Proxy URL had no scheme, should start with http:// or https://",
+            ),
+            (
+                "localhost:8080",
+                "Proxy URL had no scheme, should start with http:// or https://",
+            ),
+            (
+                "ftp://google.com",
+                "Proxy URL had unsupported scheme ftp, should use http:// or https://",
+            ),
+        ],
+    )
+    def test_invalid_schema(self, url, error_msg):
+        with pytest.raises(ProxySchemeUnknown, match=error_msg):
+            proxy_from_url(url)
+
 
 @pytest.mark.skipif(not HAS_IPV6, reason="Only runs on IPv6 systems")
 class TestIPv6HTTPProxyManager(IPv6HTTPDummyProxyTestCase):

    

Source-Sync

tags

participants (1)