Hello community, here is the log from the commit of package python-scales for openSUSE:Factory checked in at 2019-09-11 10:40:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scales (Old) and /work/SRC/openSUSE:Factory/.python-scales.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scales" Wed Sep 11 10:40:15 2019 rev:2 rq:729907 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scales/python-scales.changes 2018-09-18 11:51:31.375408900 +0200 +++ /work/SRC/openSUSE:Factory/.python-scales.new.7948/python-scales.changes 2019-09-11 10:40:16.531221313 +0200 @@ -1,0 +2,6 @@ +Tue Sep 10 13:59:35 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to work with python 3.8: + * python38.patch + +------------------------------------------------------------------- New: ---- python38.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scales.spec ++++++ --- /var/tmp/diff_new_pack.S2QyXK/_old 2019-09-11 10:40:18.255221006 +0200 +++ /var/tmp/diff_new_pack.S2QyXK/_new 2019-09-11 10:40:18.259221005 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-scales # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ URL: https://www.github.com/Cue/scales Source: https://files.pythonhosted.org/packages/source/s/scales/scales-%{version}.tar.gz Source99: https://raw.githubusercontent.com/Cue/scales/master/LICENSE +Patch0: python38.patch BuildRequires: %{python_module nose} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} @@ -40,6 +41,7 @@ %prep %setup -q -n scales-%{version} +%patch0 -p1 cp %{SOURCE99} . %build ++++++ python38.patch ++++++ >From ee69d45f1a7f928f7b241702e9be06007444115e Mon Sep 17 00:00:00 2001 From: Lumir Balhar <[email protected]> Date: Fri, 30 Aug 2019 10:59:43 +0200 Subject: [PATCH 2/2] Use `html` module in Python 3 and cgi module in Python 2 `cgi.escape()` has been deprecated since Python 3.2 and removed from Python 3.8. Fixes: https://github.com/Cue/scales/issues/46 --- src/greplin/scales/formats.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/greplin/scales/formats.py b/src/greplin/scales/formats.py index c4ef979..b6a96d4 100644 --- a/src/greplin/scales/formats.py +++ b/src/greplin/scales/formats.py @@ -16,7 +16,11 @@ from greplin import scales -import cgi +try: + import html +except ImportError: + # Python 2.7 has no html module + import cgi as html import six import json import operator @@ -105,7 +109,7 @@ def _htmlRenderDict(pathParts, statDict, output): output.write('<div class="level">') for key in keys: - keyStr = cgi.escape(_utf8str(key)) + keyStr = html.escape(_utf8str(key)) value = statDict[key] if hasattr(value, '__call__'): value = value() @@ -119,7 +123,7 @@ def _htmlRenderDict(pathParts, statDict, output): _htmlRenderDict(valuePath, value, output) else: output.write('<div><span class="key">%s</span> <span class="%s">%s</span></div>' % - (keyStr, type(value).__name__, cgi.escape(_utf8str(value)).replace('\n', '<br/>'))) + (keyStr, type(value).__name__, html.escape(_utf8str(value)).replace('\n', '<br/>'))) if links: for link in links:
