From f2fe290873e5bd8571d8839be0a63fca290d52bf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 28 2018 08:01:57 +0000 Subject: [PATCH 1/2] Iterate over a list instead of an iterator to avoid changing dict in place Changing the dict in place makes py3 unhappy Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py index 26fcf55..6ba3fad 100644 --- a/pagure/lib/tasks.py +++ b/pagure/lib/tasks.py @@ -852,7 +852,7 @@ def commits_author_stats(self, session, repopath): author = commit.author.name stats[(author, email)] += 1 - for (name, email), val in stats.items(): + for (name, email), val in list(stats.items()): if not email: # Author email is missing in the git commit. continue From 587ce4b6c71508d5b36c419caa30a9a25b0a5ebb Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 28 2018 12:13:40 +0000 Subject: [PATCH 2/2] Use the same pattern as elsewhere to work with both py2 and py3 Signed-off-by: Pierre-Yves Chibon --- diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index f9841e8..fa6b916 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -930,7 +930,8 @@ class PagureFlaskForktests(tests.Modeltests): # sort by last_updated output = self.app.get('/test/pull-requests?order_key=last_updated') - tr_elements = re.findall(r'(.*?)', output.data, re.M | re.S) + output_text = output.get_data(as_text=True) + tr_elements = re.findall('(.*?)', output_text, re.M | re.S) self.assertEqual(output.status_code, 200) arrowed_th = ('Modified\n ') @@ -949,7 +950,8 @@ class PagureFlaskForktests(tests.Modeltests): # sort by last_updated output = self.app.get('/test/pull-requests?order_key=last_updated') - tr_elements = re.findall(r'(.*?)', output.data, re.M | re.S) + output_text = output.get_data(as_text=True) + tr_elements = re.findall(r'(.*?)', output_text, re.M | re.S) self.assertEqual(output.status_code, 200) # Make sure that PR four is first since it was modified last self.assertIn('href="/test/pull-request/1"', tr_elements[1]) @@ -962,7 +964,8 @@ class PagureFlaskForktests(tests.Modeltests): # Now query so that the results are ascending output = self.app.get('/test/pull-requests?' 'order_key=last_updated&order=asc') - tr_elements = re.findall(r'(.*?)', output.data, re.M | re.S) + output_text = output.get_data(as_text=True) + tr_elements = re.findall(r'(.*?)', output_text, re.M | re.S) arrowed_th = ('Modified\n ') self.assertIn(arrowed_th, tr_elements[0])