Hello community, here is the log from the commit of package python-PyTrie for openSUSE:Factory checked in at 2019-12-04 13:53:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyTrie (Old) and /work/SRC/openSUSE:Factory/.python-PyTrie.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyTrie" Wed Dec 4 13:53:40 2019 rev:3 rq:753288 version:0.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyTrie/python-PyTrie.changes 2019-04-18 09:57:23.985378071 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyTrie.new.4691/python-PyTrie.changes 2019-12-04 14:20:18.654434637 +0100 @@ -1,0 +2,6 @@ +Tue Dec 3 15:14:36 UTC 2019 - Matej Cepl <mc...@suse.com> + +- Add patch no-import-from-collections.patch to avoid any import + directly from collections. + +------------------------------------------------------------------- New: ---- no-import-from-collections.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyTrie.spec ++++++ --- /var/tmp/diff_new_pack.XbA0WE/_old 2019-12-04 14:20:19.026434950 +0100 +++ /var/tmp/diff_new_pack.XbA0WE/_new 2019-12-04 14:20:19.030434954 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-PyTrie # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,9 @@ Source: https://files.pythonhosted.org/packages/source/P/PyTrie/PyTrie-%{version}.tar.gz Source1: https://raw.githubusercontent.com/gsakkis/pytrie/master/LICENSE Patch0: fix-sorting-py2.patch +# PATCH-FIX-UPSTREAM no-import-from-collections.patch gh#gsakkis/pytrie#5 mc...@suse.com +# Don't import directly from collections. +Patch1: no-import-from-collections.patch BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sortedcontainers} BuildRequires: fdupes @@ -51,7 +54,7 @@ %prep %setup -q -n PyTrie-%{version} cp %{SOURCE1} . -%patch0 -p1 +%autopatch -p1 %build %python_build ++++++ no-import-from-collections.patch ++++++ >From 242b04de42f4c78ef5c86df55ff41b222986d268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mc...@cepl.eu> Date: Tue, 3 Dec 2019 16:09:20 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20import=20from=20collections=20g?= =?UTF-8?q?enerally,=20but=20directly=20from=20collections.abc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #1 --- pytrie.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/pytrie.py +++ b/pytrie.py @@ -45,7 +45,10 @@ __all__ = ['Trie', 'StringTrie', 'Sorted import sys from copy import copy -from collections import MutableMapping +try: + from collections.abc import MutableMapping +except ImportError: + from collections import MutableMapping import sortedcontainers
