Merge lp:~jelmer/loggerhead/pyupgrade into lp:loggerhead

[Jelmer Vernooij]

Upgrade Python code to a modern version

Upgrade code to a modern version (3.x+)

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'loggerhead/tests/test_controllers.py'
--- loggerhead/tests/test_controllers.py	2023-02-01 18:02:41 +0000
+++ loggerhead/tests/test_controllers.py	2023-02-02 20:36:19 +0000
@@ -14,7 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from __future__ import absolute_import
 
 import json
 import tarfile
@@ -174,7 +173,7 @@
 
     def test_add_template_values_with_non_ascii(self):
         branch_app = self.make_branch_app_for_revision_ui(
-                [(u'skr\xe1', b'content\n')], [(u'skr\xe1', b'new content\n')])
+                [('skr\xe1', b'content\n')], [('skr\xe1', b'new content\n')])
         env = {'SCRIPT_NAME': '/',
                'PATH_INFO': '/revision/1',
                'QUERY_STRING': 'start_revid=1',
@@ -192,7 +191,7 @@
              'diff-1': 'rev-1/null%253A/skr%25C3%25A1'})
         self.assertEqual(
             json.loads(values['path_to_id']),
-            {'/': 'diff-0', u'skr\xe1': 'diff-1'})
+            {'/': 'diff-0', 'skr\xe1': 'diff-1'})
 
     def test_get_values_smoke(self):
         branch_app = self.make_branch_app_for_revision_ui(
@@ -246,7 +245,7 @@
         # A lot of this state is set up by __call__, but we'll do it directly
         # here.
         ann_ui.args = ['rev2']
-        annotate_info = ann_ui.get_values(u'filename', kwargs={}, headers={})
+        annotate_info = ann_ui.get_values('filename', kwargs={}, headers={})
         annotated = annotate_info['annotated']
         self.assertEqual(2, len(annotated))
         self.assertEqual('2', annotated[1].change.revno)
@@ -257,7 +256,7 @@
         history = [(b'rev1', b'old\nold\n', '.'), (b'rev2', b'new\nold\n', '')]
         ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['rev2']
-        ann_ui.get_values(u'filename', kwargs={}, headers={})
+        ann_ui.get_values('filename', kwargs={}, headers={})
 
     def test_annotate_file_zero_sized(self):
         # Test against a zero-sized file without breaking. No annotation
@@ -265,7 +264,7 @@
         history = [(b'rev1', b'', '.')]
         ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['rev1']
-        annotate_info = ann_ui.get_values(u'filename', kwargs={}, headers={})
+        annotate_info = ann_ui.get_values('filename', kwargs={}, headers={})
         annotated = annotate_info['annotated']
         self.assertEqual(0, len(annotated))
 
@@ -274,14 +273,14 @@
         ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['rev1']
         self.assertRaises(
-            HTTPNotFound, ann_ui.get_values, u'not-filename', {}, {})
+            HTTPNotFound, ann_ui.get_values, 'not-filename', {}, {})
 
     def test_annotate_nonexistent_rev(self):
         history = [(b'rev1', b'', '.')]
         ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['norev']
         self.assertRaises(
-            HTTPNotFound, ann_ui.get_values, u'not-filename', {}, {})
+            HTTPNotFound, ann_ui.get_values, 'not-filename', {}, {})
 
 
 class TestFileDiffUI(BasicTests):
@@ -303,7 +302,7 @@
     def test_get_values_smoke(self):
         branch_app, (rev1, rev2) = self.make_branch_app_for_filediff_ui()
         env = {'SCRIPT_NAME': '/',
-               'PATH_INFO': '/+filediff/%s/%s/filename' % (rev2.decode('utf-8'), rev1.decode('utf-8')),
+               'PATH_INFO': '/+filediff/{}/{}/filename'.format(rev2.decode('utf-8'), rev1.decode('utf-8')),
                'REQUEST_METHOD': 'GET',
                'wsgi.url_scheme': 'http',
                'SERVER_NAME': 'localhost',
@@ -318,7 +317,7 @@
     def test_json_render_smoke(self):
         branch_app, (rev1, rev2) = self.make_branch_app_for_filediff_ui()
         env = {'SCRIPT_NAME': '/',
-               'PATH_INFO': '/+json/+filediff/%s/%s/filename' % (rev2.decode('utf-8'), rev1.decode('utf-8')),
+               'PATH_INFO': '/+json/+filediff/{}/{}/filename'.format(rev2.decode('utf-8'), rev1.decode('utf-8')),
                'REQUEST_METHOD': 'GET',
                'wsgi.url_scheme': 'http',
                'SERVER_NAME': 'localhost',
@@ -422,7 +421,7 @@
                 % response.headers)
 
     def __str__(self):
-        return 'MatchesDownloadHeaders(%r, %r)' % (
+        return 'MatchesDownloadHeaders({!r}, {!r})'.format(
             self.expect_filename, self.expect_mimetype)
 
 

=== modified file 'loggerhead/tests/test_corners.py'
--- loggerhead/tests/test_corners.py	2023-02-02 11:08:17 +0000
+++ loggerhead/tests/test_corners.py	2023-02-02 20:36:19 +0000
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 
 from .test_simple import BasicTests

=== modified file 'loggerhead/tests/test_history.py'
--- loggerhead/tests/test_history.py	2023-02-01 18:02:41 +0000
+++ loggerhead/tests/test_history.py	2023-02-02 20:36:19 +0000
@@ -107,7 +107,7 @@
                          list(history.get_revids_from(search_revs, tip_rev)))
 
 
-class _DictProxy(object):
+class _DictProxy:
 
     def __init__(self, d):
         self._d = d
@@ -167,7 +167,7 @@
         # We already know revs[-1] because we passed it in.
         self.assertEqual(set(), accessed)
         self.assertEqual(revs[-2], next(result))
-        self.assertEqual(set([history._rev_indices[revs[-1]]]), accessed)
+        self.assertEqual({history._rev_indices[revs[-1]]}, accessed)
 
     def test_get_revids_doesnt_over_produce_for_merges(self):
         # get_revids_from shouldn't walk the whole ancestry just to get the
@@ -179,13 +179,13 @@
         self.assertEqual(revs[-3], next(result))
         # We access 'W' because we are checking that W wasn't merged into X.
         # The important bit is that we aren't getting the whole ancestry.
-        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:4]]),
+        self.assertEqual({history._rev_indices[x] for x in list(reversed(revs))[:4]},
                          accessed)
         self.assertEqual(revs[-5], next(result))
-        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:6]]),
+        self.assertEqual({history._rev_indices[x] for x in list(reversed(revs))[:6]},
                          accessed)
         self.assertRaises(StopIteration, next, result)
-        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:6]]),
+        self.assertEqual({history._rev_indices[x] for x in list(reversed(revs))[:6]},
                          accessed)
 
 
@@ -238,16 +238,16 @@
         tree = self.make_branch_and_tree('test')
         rev_id = tree.commit('Commit Message', timestamp=1299838474.317,
             timezone=3600, committer='Joe Example <[e-mail]>',
-            revprops={'authors': u'A Author <[e-mail]>\n'
-                                 u'B Author <[e-mail]>'})
+            revprops={'authors': 'A Author <[e-mail]>\n'
+                                 'B Author <[e-mail]>'})
         self.addCleanup(tree.branch.lock_write().unlock)
         rev = tree.branch.repository.get_revision(rev_id)
         history = _mod_history.History(tree.branch, {})
         change = history._change_from_revision(rev)
-        self.assertEqual(u'Joe Example <[e-mail]>',
+        self.assertEqual('Joe Example <[e-mail]>',
                          change.committer)
-        self.assertEqual([u'A Author <[e-mail]>',
-                          u'B Author <[e-mail]>'],
+        self.assertEqual(['A Author <[e-mail]>',
+                          'B Author <[e-mail]>'],
                          change.authors)
 
 
@@ -295,7 +295,7 @@
         self.assertEqual(list(reversed(revs))[:6], revid_list)
         self.assertEqual(revs[-1], revid)
         self.assertEqual(revs[-1], start_revid)
-        self.assertEqual(set([history._rev_indices[x] for x in list(reversed(revs))[:6]]),
+        self.assertEqual({history._rev_indices[x] for x in list(reversed(revs))[:6]},
                          accessed)
 
 

=== modified file 'loggerhead/tests/test_http_head.py'
--- loggerhead/tests/test_http_head.py	2023-01-31 19:08:09 +0000
+++ loggerhead/tests/test_http_head.py	2023-02-02 20:36:19 +0000
@@ -31,8 +31,7 @@
 
 def yielding_app(environ, start_response):
     writer = start_response('200 OK', headers)
-    for chunk in content:
-        yield chunk
+    yield from content
 
 
 def list_app(environ, start_response):

=== modified file 'loggerhead/tests/test_load_test.py'
--- loggerhead/tests/test_load_test.py	2023-02-01 18:02:41 +0000
+++ loggerhead/tests/test_load_test.py	2023-02-02 20:36:19 +0000
@@ -122,7 +122,7 @@
 class TestRequestWorker(tests.TestCaseWithTransport):
 
     def setUp(self):
-        super(TestRequestWorker, self).setUp()
+        super().setUp()
         self.transport_readonly_server = http_server.HttpServer
 
     def test_request_items(self):
@@ -278,22 +278,22 @@
 class TestActionScriptIntegration(tests.TestCaseWithTransport):
 
     def setUp(self):
-        super(TestActionScriptIntegration, self).setUp()
+        super().setUp()
         self.transport_readonly_server = http_server.HttpServer
 
     def test_full_integration(self):
         self.build_tree(['first', 'second', 'third', 'fourth'])
         url = self.get_readonly_url()
-        script = load_test.ActionScript.parse("""{
-            "parameters": {"base_url": "%s", "blocking_timeout": 2.0},
+        script = load_test.ActionScript.parse("""{{
+            "parameters": {{"base_url": "{}", "blocking_timeout": 2.0}},
             "requests": [
-                {"thread": "1", "relpath": "first"},
-                {"thread": "2", "relpath": "second"},
-                {"thread": "1", "relpath": "no-this"},
-                {"thread": "2", "relpath": "or-this"},
-                {"thread": "1", "relpath": "third"},
-                {"thread": "2", "relpath": "fourth"}
-            ]}""" % (url,))
+                {{"thread": "1", "relpath": "first"}},
+                {{"thread": "2", "relpath": "second"}},
+                {{"thread": "1", "relpath": "no-this"}},
+                {{"thread": "2", "relpath": "or-this"}},
+                {{"thread": "1", "relpath": "third"}},
+                {{"thread": "2", "relpath": "fourth"}}
+            ]}}""".format(url))
         script.run()
         worker = script._get_worker("1")
         self.assertEqual([("first", True), ('no-this', False),
@@ -310,21 +310,21 @@
 class TestRunScript(tests.TestCaseWithTransport):
 
     def setUp(self):
-        super(TestRunScript, self).setUp()
+        super().setUp()
         self.transport_readonly_server = http_server.HttpServer
 
     def test_run_script(self):
         self.build_tree(['file1', 'file2', 'file3', 'file4'])
         url = self.get_readonly_url()
-        self.build_tree_contents([('localhost.script', """{
-    "parameters": {"base_url": "%s", "blocking_timeout": 0.1},
+        self.build_tree_contents([('localhost.script', """{{
+    "parameters": {{"base_url": "{}", "blocking_timeout": 0.1}},
     "requests": [
-        {"thread": "1", "relpath": "file1"},
-        {"thread": "2", "relpath": "file2"},
-        {"thread": "1", "relpath": "file3"},
-        {"thread": "2", "relpath": "file4"}
+        {{"thread": "1", "relpath": "file1"}},
+        {{"thread": "2", "relpath": "file2"}},
+        {{"thread": "1", "relpath": "file3"}},
+        {{"thread": "2", "relpath": "file4"}}
     ]
-}""" % (url,))])
+}}""".format(url))])
         script = load_test.run_script('localhost.script')
         worker = script._threads["1"][0]
         self.assertEqual([("file1", True), ('file3', True)],

=== modified file 'loggerhead/tests/test_revision_ui.py'
--- loggerhead/tests/test_revision_ui.py	2023-02-01 18:02:41 +0000
+++ loggerhead/tests/test_revision_ui.py	2023-02-02 20:36:19 +0000
@@ -15,7 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-from __future__ import absolute_import
 
 from .test_simple import BasicTests
 
@@ -25,8 +24,8 @@
     def test_authors_vs_committer(self):
         self.createBranch()
         self.tree.commit('First', committer="Joe Example <[e-mail]>",
-            revprops={'authors': u'A Author <[e-mail]>\n'
-                                 u'B Author <[e-mail]>'})
+            revprops={'authors': 'A Author <[e-mail]>\n'
+                                 'B Author <[e-mail]>'})
         app = self.setUpLoggerhead()
         res = app.get('/revision/1')
         # We would like to assert that Joe Example is connected to Committer,

=== modified file 'loggerhead/tests/test_simple.py'
--- loggerhead/tests/test_simple.py	2023-02-01 18:02:41 +0000
+++ loggerhead/tests/test_simple.py	2023-02-02 20:36:19 +0000
@@ -15,7 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-from __future__ import absolute_import
 
 import json
 import logging
@@ -124,7 +123,7 @@
             self.assertIn(
                 escaped,
                 body_no_span,
-                "did not find %r in %r" % (escaped, body_no_span)
+                "did not find {!r} in {!r}".format(escaped, body_no_span)
             )
 
     def test_inventory(self):
@@ -192,8 +191,8 @@
             ensure_config_dir_exists = config.ensure_config_dir_exists
         ensure_config_dir_exists()
         with open(locations, 'w') as f:
-            f.write('[%s]\nhttp_serve = False' % (
-                self.tree.branch.base,))
+            f.write('[{}]\nhttp_serve = False'.format(
+                self.tree.branch.base))
 
     def test_no_access(self):
         app = self.setUpLoggerhead()

=== modified file 'loggerhead/tests/test_templating.py'
--- loggerhead/tests/test_templating.py	2018-10-20 11:09:30 +0000
+++ loggerhead/tests/test_templating.py	2023-02-02 20:36:19 +0000
@@ -1,6 +1,6 @@
 from ..zptsupport import load_template
 
-RENDERED = u"<html>\n<head>\n<title>%s</title>\n</head>\n\
+RENDERED = "<html>\n<head>\n<title>%s</title>\n</head>\n\
 <body>\n<div>Hello, %s</div>\n</body>\n</html>"