From 040c1afc709ae32d5cedd2f0a3815a12b1909bf3 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Thu, 14 Mar 2019 18:47:20 -0400 Subject: [PATCH] Resolve deprecation warnings Arvados-DCO-1.1-Signed-off-by: Tom Morris --- tools/crunchstat-summary/crunchstat_summary/webchart.py | 8 ++++++-- tools/crunchstat-summary/tests/test_examples.py | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/crunchstat-summary/crunchstat_summary/webchart.py b/tools/crunchstat-summary/crunchstat_summary/webchart.py index 91a196ffbe..cf0c1e67aa 100644 --- a/tools/crunchstat-summary/crunchstat_summary/webchart.py +++ b/tools/crunchstat-summary/crunchstat_summary/webchart.py @@ -2,7 +2,11 @@ # # SPDX-License-Identifier: AGPL-3.0 -import cgi +try: + from html import escape +except ImportError: + from cgi import escape + import json import pkg_resources @@ -27,7 +31,7 @@ class WebChart(object): {} - '''.format(cgi.escape(self.label), + '''.format(escape(self.label), self.JSLIB, self.js(), self.headHTML()) def js(self): diff --git a/tools/crunchstat-summary/tests/test_examples.py b/tools/crunchstat-summary/tests/test_examples.py index 0e3ccd35a4..7603ea488c 100644 --- a/tools/crunchstat-summary/tests/test_examples.py +++ b/tools/crunchstat-summary/tests/test_examples.py @@ -11,6 +11,7 @@ import gzip from io import open import mock import os +import sys import unittest from crunchstat_summary.command import UTF8Decode @@ -53,7 +54,11 @@ class HTMLFromFile(ReportDiff): ['--format=html', '--log-file', logfile]) cmd = crunchstat_summary.command.Command(args) cmd.run() - self.assertRegexpMatches(cmd.report(), r'(?is).*\s*$') + if sys.version_info >= (3,2): + self.assertRegex(cmd.report(), r'(?is).*\s*$') + else: + self.assertRegexpMatches(cmd.report(), r'(?is).*\s*$') + class SummarizeEdgeCases(unittest.TestCase): def test_error_messages(self): -- 2.30.2