Accepting request 893694 from home:pgajdos:python

- version update to 2.1.2
  Fixed: Support Python 3.9's changed urllib.parse.urljoin() behavior.
  Changed: Drop semicolon query delimiters. See https://bugs.python.org/issue42967.
  Changed: Drop support for EOL Python 3.4 and Python 3.5.
- deleted patches
  - furl-py39-join.patch (upstreamed)
  - tests_overcome_bpo42967.patch (upstreamed)

OBS-URL: https://build.opensuse.org/request/show/893694
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-furl?expand=0&rev=12
This commit is contained in:
Markéta Machová 2021-05-17 11:16:48 +00:00 committed by Git OBS Bridge
parent 68085651c7
commit 581b374633
6 changed files with 15 additions and 62 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0e0231a1feee2acd256574b7033df3144775451c610cb587060d6a0d7e0b621
size 43765

3
furl-2.1.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7dba33eafbee7dbc83963534b25e72f816cced48ac53191ee60bfcc62933918
size 44195

View File

@ -1,28 +0,0 @@
Index: furl-2.1.0/tests/test_furl.py
===================================================================
--- furl-2.1.0.orig/tests/test_furl.py
+++ furl-2.1.0/tests/test_furl.py
@@ -14,6 +14,7 @@ from __future__ import division
import warnings
from abc import ABCMeta, abstractmethod
+import sys
import six
from six.moves import zip
@@ -2037,9 +2038,13 @@ class TestFurl(unittest.TestCase):
assert f.url == 'http://pepp.ru/a/b/c#uwantpump?'
# In edge cases (e.g. URLs without an authority/netloc), behave
- # identically to urllib.parse.urljoin().
+ # identically to urllib.parse.urljoin(), which changed behavior
+ # in Python 3.9
f = furl.furl('wss://slrp.com/').join('foo:1')
- assert f.url == 'wss://slrp.com/foo:1'
+ if sys.version_info[:2] < (3, 9):
+ assert f.url == 'wss://slrp.com/foo:1'
+ else:
+ assert f.url == 'foo:1'
f = furl.furl('wss://slrp.com/').join('foo:1:rip')
assert f.url == 'foo:1:rip'
f = furl.furl('scheme:path').join('foo:blah')

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon May 17 10:41:58 UTC 2021 - pgajdos@suse.com
- version update to 2.1.2
Fixed: Support Python 3.9's changed urllib.parse.urljoin() behavior.
Changed: Drop semicolon query delimiters. See https://bugs.python.org/issue42967.
Changed: Drop support for EOL Python 3.4 and Python 3.5.
- deleted patches
- furl-py39-join.patch (upstreamed)
- tests_overcome_bpo42967.patch (upstreamed)
-------------------------------------------------------------------
Mon Mar 29 22:10:03 UTC 2021 - Ben Greiner <code@bnavigator.de>

View File

@ -18,19 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-furl
Version: 2.1.0
Version: 2.1.2
Release: 0
Summary: A Python URL manipulation library
License: Unlicense
Group: Development/Languages/Python
URL: https://github.com/gruns/furl
Source: https://files.pythonhosted.org/packages/source/f/furl/furl-%{version}.tar.gz
# PATCH-FIX-UPSTREAM tests_overcome_bpo42967.patch gh#gruns/furl#135 mcepl@suse.com
# With fix for bpo#42967, it is not possible to separate
# parameters of URL query with semicolon
Patch0: tests_overcome_bpo42967.patch
# PATCH-FIX-UPSTREAM furl-py39-join.patch -- gh#gruns/furl#139
Patch1: furl-py39-join.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros

View File

@ -1,24 +0,0 @@
--- a/tests/test_furl.py
+++ b/tests/test_furl.py
@@ -602,17 +602,17 @@ class TestQuery(unittest.TestCase):
'space=a+a&amp=a%26a', 'a a=a a&no encoding=sup', 'a+a=a+a',
'a%20=a+a', 'a%20a=a%20a', 'a+a=a%20a', 'space=a a&amp=a^a',
'a=a&s=s#s', '+=+', "/?:@-._~!$&'()*+,=/?:@-._~!$'()*+,=",
- 'a=a&c=c%5Ec', '<=>&^="', '%3C=%3E&%5E=%22', '%=%;`=`',
+ 'a=a&c=c%5Ec', '<=>&^="', '%3C=%3E&%5E=%22', '%=%&`=`',
'%25=%25&%60=%60',
# Only keys, no values.
'asdfasdf', '/asdf/asdf/sdf', '*******', '!@#(*&@!#(*@!#', 'a&b',
- 'a;b',
+ 'a&b',
# Repeated parameters.
'a=a&a=a', 'space=a+a&space=b+b',
# Empty keys and/or values.
'=', 'a=', 'a=a&a=', '=a&=b',
- # Semicolon delimiter, like 'a=a;b=b'.
- 'a=a;a=a', 'space=a+a;space=b+b',
+ # Semicolon delimiter is not allowed per default after bpo#42967
+ 'a=a&a=a', 'space=a+a&space=b+b',
]))
self.items = (self.itemlists + self.itemdicts + self.itemomdicts +
self.itemstrs)