From 8290b50aa42617dee977a073970c18dce992f8b1 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Tue, 1 Dec 2020 15:18:29 +0100 Subject: [PATCH 1/3] Replace sys.maxint with sys.maxsize sys.maxint has been removed in Python 3.1. https://docs.python.org/3.1/whatsnew/3.0.html#integers --- metrics.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metrics.py b/metrics.py index 8610a282..42ab75ea 100755 --- a/metrics.py +++ b/metrics.py @@ -548,9 +548,9 @@ def main(args): if args.wipe_cache: Cache.delete_all() if args.heavy_cache: - Cache.PATTERNS[r'/search/request'] = sys.maxint - Cache.PATTERNS[r'/source/[^/]+/{}/_history'.format(package)] = sys.maxint - Cache.PATTERNS[r'/source/[^/]+/{}/[^/]+\?rev=.*'.format(package)] = sys.maxint + Cache.PATTERNS[r'/search/request'] = sys.maxsize + Cache.PATTERNS[r'/source/[^/]+/{}/_history'.format(package)] = sys.maxsize + Cache.PATTERNS[r'/source/[^/]+/{}/[^/]+\?rev=.*'.format(package)] = sys.maxsize Cache.init('metrics') Config(apiurl, args.project) From abc39a2822aeafbaf31a77978992d3c17abe8729 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Tue, 1 Dec 2020 16:19:35 +0100 Subject: [PATCH 2/3] Rename ConfigParser to configparser ConfigParser has been renamed to configparser in Python 3. --- metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics.py b/metrics.py index 42ab75ea..4267ea4f 100755 --- a/metrics.py +++ b/metrics.py @@ -391,7 +391,7 @@ def dashboard_at(api, filename, datetime=None, revision=None): elif filename in ('config'): if content: # TODO re-use from osclib.conf. - from ConfigParser import ConfigParser + from configparser import ConfigParser import io cp = ConfigParser() From 4be4819544574d80c02f2d7bd5083fb9cade8338 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Tue, 1 Dec 2020 17:16:58 +0100 Subject: [PATCH 3/3] Use string instead of byte stream for configparser --- metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics.py b/metrics.py index 4267ea4f..87c2184a 100755 --- a/metrics.py +++ b/metrics.py @@ -396,7 +396,7 @@ def dashboard_at(api, filename, datetime=None, revision=None): cp = ConfigParser() config = '[remote]\n' + content - cp.readfp(io.BytesIO(config)) + cp.read_string(config) return dict(cp.items('remote')) return {}