launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #27626
[Merge] ~cjwatson/turnip:py3only-super into turnip:master
Colin Watson has proposed merging ~cjwatson/turnip:py3only-super into turnip:master.
Commit message:
Rely on Python 3 zero-argument super()
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/410807
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:py3only-super into turnip:master.
diff --git a/turnip/api/store.py b/turnip/api/store.py
index 8f24a79..6fe3095 100644
--- a/turnip/api/store.py
+++ b/turnip/api/store.py
@@ -297,8 +297,7 @@ class AlreadyExistsError(GitError):
"""We tried to initialise a repository that already exists."""
def __init__(self, path):
- super(AlreadyExistsError, self).__init__(
- "Repository '%s' already exists" % path)
+ super().__init__("Repository '%s' already exists" % path)
self.path = path
diff --git a/turnip/api/tests/test_api.py b/turnip/api/tests/test_api.py
index 43a1274..facd042 100644
--- a/turnip/api/tests/test_api.py
+++ b/turnip/api/tests/test_api.py
@@ -63,7 +63,7 @@ class ApiRepoStoreMixin:
class ApiTestCase(TestCase, ApiRepoStoreMixin):
def setUp(self):
- super(ApiTestCase, self).setUp()
+ super().setUp()
self.setupRepoStore()
def assertReferencesEqual(self, repo, expected, observed):
@@ -1006,7 +1006,7 @@ class ApiTestCase(TestCase, ApiRepoStoreMixin):
class AsyncRepoCreationAPI(TestCase, ApiRepoStoreMixin):
def setUp(self):
- super(AsyncRepoCreationAPI, self).setUp()
+ super().setUp()
self.setupRepoStore()
# XML-RPC server
self.virtinfo = FakeVirtInfoService(allowNone=True)
diff --git a/turnip/api/tests/test_store.py b/turnip/api/tests/test_store.py
index 816887c..0f1acc5 100644
--- a/turnip/api/tests/test_store.py
+++ b/turnip/api/tests/test_store.py
@@ -32,7 +32,7 @@ from turnip.tests.tasks import CeleryWorkerFixture
class InitTestCase(TestCase):
def setUp(self):
- super(InitTestCase, self).setUp()
+ super().setUp()
self.repo_store = self.useFixture(TempDir()).path
self.useFixture(EnvironmentVariable("REPO_STORE", self.repo_store))
diff --git a/turnip/api/views.py b/turnip/api/views.py
index ff34e31..d6dcddf 100644
--- a/turnip/api/views.py
+++ b/turnip/api/views.py
@@ -44,7 +44,7 @@ class RepoAPI(BaseAPI):
"""Provides HTTP API for repository actions."""
def __init__(self, request, context=None):
- super(RepoAPI, self).__init__()
+ super().__init__()
self.request = request
def collection_options(self):
@@ -137,7 +137,7 @@ class RepackAPI(BaseAPI):
"""Provides HTTP API for repository repacking."""
def __init__(self, request, context=None):
- super(RepackAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -157,7 +157,7 @@ class GarbageCollectAPI(BaseAPI):
"""Provides HTTP API for running gc for repository."""
def __init__(self, request, context=None):
- super(GarbageCollectAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -177,7 +177,7 @@ class RefCopyAPI(BaseAPI):
"""Provides HTTP API for git references copy operations."""
def __init__(self, request, context=None):
- super(RefCopyAPI, self).__init__()
+ super().__init__()
self.request = request
def _validate_refs(self, repo_store, repo_name, refs_or_commits):
@@ -237,7 +237,7 @@ class RefAPI(BaseAPI):
"""Provides HTTP API for git references."""
def __init__(self, request, context=None):
- super(RefAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -284,7 +284,7 @@ class DiffAPI(BaseAPI):
{name} can be two : separated repositories, for a cross repository diff.
"""
def __init__(self, request, context=None):
- super(DiffAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -316,7 +316,7 @@ class DiffMergeAPI(BaseAPI):
{name} can be two : separated repositories, for a cross repository diff.
"""
def __init__(self, request, context=None):
- super(DiffMergeAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -341,7 +341,7 @@ class CommitAPI(BaseAPI):
"""Provides HTTP API for git commits."""
def __init__(self, request, context=None):
- super(CommitAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -369,7 +369,7 @@ class LogAPI(BaseAPI):
"""Provides HTTP API for git logs."""
def __init__(self, request, context=None):
- super(LogAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -391,7 +391,7 @@ class DetectMergesAPI(BaseAPI):
"""Provides HTTP API for detecting merges."""
def __init__(self, request, context=None):
- super(DetectMergesAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
@@ -420,7 +420,7 @@ class BlobAPI(BaseAPI):
"""Provides HTTP API for fetching blobs."""
def __init__(self, request, context=None):
- super(BlobAPI, self).__init__()
+ super().__init__()
self.request = request
@validate_path
diff --git a/turnip/pack/git.py b/turnip/pack/git.py
index a3d77f7..0597224 100644
--- a/turnip/pack/git.py
+++ b/turnip/pack/git.py
@@ -62,13 +62,13 @@ class six_dict(dict):
that soon (see https://twistedmatrix.com/trac/ticket/9933).
"""
def itervalues(self):
- return super(six_dict, self).values()
+ return super().values()
def iterkeys(self):
- return super(six_dict, self).keys()
+ return super().keys()
def __repr__(self):
- return "<six_dict %s>" % super(six_dict, self).__repr__()
+ return "<six_dict %s>" % super().__repr__()
class RequestIDLogger(Logger):
@@ -78,7 +78,7 @@ class RequestIDLogger(Logger):
if format is not None and request_id is not None:
format = '[request-id=%s] [%s] %s' % (
request_id, self.source.__class__.__name__, format)
- super(RequestIDLogger, self).emit(level, format=format, **kwargs)
+ super().emit(level, format=format, **kwargs)
class UnstoppableProducerWrapper(object):
@@ -286,7 +286,7 @@ class GitProcessProtocol(protocol.ProcessProtocol, object):
if childFD == 3:
self.resourceUsageReceived(data)
else:
- super(GitProcessProtocol, self).childDataReceived(childFD, data)
+ super().childDataReceived(childFD, data)
def outReceived(self, data):
self.out_started = True
@@ -483,7 +483,7 @@ class PackProxyServerProtocol(PackServerProtocol):
def resumeProducing(self):
# Send our translated request and then open the gate to the client.
self.sendNextCommand()
- super(PackProxyServerProtocol, self).resumeProducing()
+ super().resumeProducing()
def readConnectionLost(self):
# Forward the closed stdin down the stack.
diff --git a/turnip/pack/http.py b/turnip/pack/http.py
index 70a2c21..24bb606 100644
--- a/turnip/pack/http.py
+++ b/turnip/pack/http.py
@@ -227,7 +227,7 @@ class HTTPPackClientRefsProtocol(HTTPPackClientProtocol):
self.factory.http_request.setHeader(
b'Content-Type',
b'application/x-%s-advertisement' % self.factory.command)
- super(HTTPPackClientRefsProtocol, self).startGoodResponse()
+ super().startGoodResponse()
def backendConnected(self):
HTTPPackClientProtocol.backendConnected(self)
diff --git a/turnip/pack/ssh.py b/turnip/pack/ssh.py
index 1ff91ad..7d013e4 100644
--- a/turnip/pack/ssh.py
+++ b/turnip/pack/ssh.py
@@ -130,7 +130,7 @@ class SmartSSHSession(DoNothingSession):
'git-upload-pack', 'git-receive-pack', 'turnip-set-symbolic-ref'))
def __init__(self, *args, **kwargs):
- super(SmartSSHSession, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.pack_protocol = None
self.env = {}
diff --git a/turnip/pack/tests/test_functional.py b/turnip/pack/tests/test_functional.py
index eec4db8..183565a 100644
--- a/turnip/pack/tests/test_functional.py
+++ b/turnip/pack/tests/test_functional.py
@@ -620,7 +620,7 @@ class TestBackendFunctional(FunctionalTestMixin, TestCase):
@defer.inlineCallbacks
def setUp(self):
- super(TestBackendFunctional, self).setUp()
+ super().setUp()
# Set up a PackBackendFactory on a free port in a clean repo root.
self.startVirtInfo()
@@ -647,7 +647,7 @@ class FrontendFunctionalTestMixin(FunctionalTestMixin):
@defer.inlineCallbacks
def setUp(self):
- super(FrontendFunctionalTestMixin, self).setUp()
+ super().setUp()
self.data_dir = os.path.abspath(
os.path.join(os.path.dirname(__file__), "data"))
@@ -745,7 +745,7 @@ class TestGitFrontendFunctional(FrontendFunctionalTestMixin, TestCase):
@defer.inlineCallbacks
def setUp(self):
- yield super(TestGitFrontendFunctional, self).setUp()
+ yield super().setUp()
# We run a frontend server connecting to the backend and
# virtinfo servers started by the mixin.
@@ -766,7 +766,7 @@ class TestSmartHTTPFrontendFunctional(FrontendFunctionalTestMixin, TestCase):
@defer.inlineCallbacks
def setUp(self):
- yield super(TestSmartHTTPFrontendFunctional, self).setUp()
+ yield super().setUp()
# We run a frontend server connecting to the backend and
# virtinfo servers started by the mixin.
@@ -883,7 +883,7 @@ class TestSmartHTTPFrontendWithAuthFunctional(TestSmartHTTPFrontendFunctional):
@defer.inlineCallbacks
def setUp(self):
- yield super(TestSmartHTTPFrontendWithAuthFunctional, self).setUp()
+ yield super().setUp()
self.virtinfo.require_auth = True
self.url = (
@@ -944,7 +944,7 @@ class TestSmartSSHServiceFunctional(FrontendFunctionalTestMixin, TestCase):
@defer.inlineCallbacks
def setUp(self):
- yield super(TestSmartSSHServiceFunctional, self).setUp()
+ yield super().setUp()
root = six.ensure_text(self.root)
config = os.path.join(root, "ssh-config")
diff --git a/turnip/pack/tests/test_git.py b/turnip/pack/tests/test_git.py
index 9a1e99e..f5c04c0 100644
--- a/turnip/pack/tests/test_git.py
+++ b/turnip/pack/tests/test_git.py
@@ -57,7 +57,7 @@ class TestPackServerProtocol(TestCase):
"""Test the base implementation of the git pack network protocol."""
def setUp(self):
- super(TestPackServerProtocol, self).setUp()
+ super().setUp()
self.proto = DummyPackServerProtocol()
self.transport = testing.StringTransportWithDisconnection()
self.transport.protocol = self.proto
@@ -129,7 +129,7 @@ class DummyPackBackendProtocol(git.PackBackendProtocol):
class TestPackFrontendServerProtocol(TestCase):
def setUp(self):
- super(TestPackFrontendServerProtocol, self).setUp()
+ super().setUp()
self.factory = git.PackFrontendFactory('example.com', 12345)
self.proto = git.PackFrontendServerProtocol()
self.proto.factory = self.factory
@@ -179,7 +179,7 @@ class TestPackBackendProtocol(TestCase):
run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=5)
def setUp(self):
- super(TestPackBackendProtocol, self).setUp()
+ super().setUp()
self.root = self.useFixture(TempDir()).path
self.hookrpc_handler = MockHookRPCHandler()
self.statsd_client = MockStatsd()
@@ -378,7 +378,7 @@ class TestPackVirtServerProtocol(TestCase):
helpers.decode_packet(self.transport.value()))
def setUp(self):
- super(TestPackVirtServerProtocol, self).setUp()
+ super().setUp()
self.root = self.useFixture(TempDir()).path
self.hookrpc_handler = MockHookRPCHandler()
self.hookrpc_sock = os.path.join(self.root, 'hookrpc_sock')
diff --git a/turnip/pack/tests/test_helpers.py b/turnip/pack/tests/test_helpers.py
index 0e8cc82..815497f 100644
--- a/turnip/pack/tests/test_helpers.py
+++ b/turnip/pack/tests/test_helpers.py
@@ -236,7 +236,7 @@ class TestEnsureConfig(TestCase):
"""Test repository configuration maintenance."""
def setUp(self):
- super(TestEnsureConfig, self).setUp()
+ super().setUp()
self.repo_dir = self.useFixture(TempDir()).path
init_repository(self.repo_dir, bare=True)
self.config_path = os.path.join(self.repo_dir, 'config')
@@ -278,7 +278,7 @@ class TestEnsureHooks(TestCase):
"""Test repository hook maintenance."""
def setUp(self):
- super(TestEnsureHooks, self).setUp()
+ super().setUp()
self.repo_dir = self.useFixture(TempDir()).path
self.hooks_dir = os.path.join(self.repo_dir, 'hooks')
os.mkdir(self.hooks_dir)
@@ -428,7 +428,7 @@ class TestGetRepackData(TestCase):
"""Test get repack indicators for repository."""
def setUp(self):
- super(TestGetRepackData, self).setUp()
+ super().setUp()
self.repo_dir = self.useFixture(TempDir()).path
self.repo = init_repository(self.repo_dir, bare=False)
diff --git a/turnip/pack/tests/test_hookrpc.py b/turnip/pack/tests/test_hookrpc.py
index 1bec197..585148f 100644
--- a/turnip/pack/tests/test_hookrpc.py
+++ b/turnip/pack/tests/test_hookrpc.py
@@ -70,7 +70,7 @@ class TestJSONNetStringProtocol(TestCase):
"""Test the JSON netstring protocol."""
def setUp(self):
- super(TestJSONNetStringProtocol, self).setUp()
+ super().setUp()
self.proto = DummyJSONNetstringProtocol()
self.transport = testing.StringTransportWithDisconnection()
self.transport.protocol = self.proto
@@ -127,7 +127,7 @@ class TestRPCServerProtocol(TestCase):
"""Test the socket server that handles git hook callbacks."""
def setUp(self):
- super(TestRPCServerProtocol, self).setUp()
+ super().setUp()
self.proto = hookrpc.RPCServerProtocol({
'sync': sync_rpc_method,
'async': async_rpc_method,
@@ -196,7 +196,7 @@ class TestHookRPCHandler(TestCase):
run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=5)
def setUp(self):
- super(TestHookRPCHandler, self).setUp()
+ super().setUp()
self.virtinfo = FakeVirtInfoService(allowNone=True)
self.virtinfo_listener = reactor.listenTCP(
0, server.Site(self.virtinfo))
diff --git a/turnip/pack/tests/test_hooks.py b/turnip/pack/tests/test_hooks.py
index db37120..481f0e1 100644
--- a/turnip/pack/tests/test_hooks.py
+++ b/turnip/pack/tests/test_hooks.py
@@ -57,7 +57,7 @@ class HookProcessProtocol(protocol.ProcessProtocol):
class MockHookRPCHandler(hookrpc.HookRPCHandler):
def __init__(self):
- super(MockHookRPCHandler, self).__init__(b'http://localhost', 15)
+ super().__init__(b'http://localhost', 15)
self.notifications = []
self.ref_permissions = {}
@@ -175,7 +175,7 @@ class HookTestMixin(object):
self.notifications.append(path)
def setUp(self):
- super(HookTestMixin, self).setUp()
+ super().setUp()
self.hookrpc_handler = MockHookRPCHandler()
self.hookrpc = hookrpc.HookRPCServerFactory(self.hookrpc_handler)
self.repo_dir = os.path.join(self.useFixture(TempDir()).path, '.git')
@@ -365,7 +365,7 @@ class TestUpdateHook(TestCase):
"""Tests for the git update hook"""
def setUp(self):
- super(TestUpdateHook, self).setUp()
+ super().setUp()
self.useFixture(MonkeyPatch(
'turnip.pack.hooks.hook.check_ancestor',
self.patched_ancestor_check
diff --git a/turnip/pack/tests/test_http.py b/turnip/pack/tests/test_http.py
index 9624aa2..66e4a84 100644
--- a/turnip/pack/tests/test_http.py
+++ b/turnip/pack/tests/test_http.py
@@ -48,7 +48,7 @@ class LessDummyRequest(requesthelper.DummyRequest):
startedWriting = 0
def __init__(self, *args, **kwargs):
- super(LessDummyRequest, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.content = BytesIO()
self.cookies = {}
@@ -58,13 +58,13 @@ class LessDummyRequest(requesthelper.DummyRequest):
def write(self, data):
self.startedWriting = 1
- super(LessDummyRequest, self).write(data)
+ super().write(data)
def registerProducer(self, prod, s):
# Avoid DummyRequest.registerProducer calling resumeProducing
# forever, never giving the reactor a chance to run.
if not s:
- super(LessDummyRequest, self).registerProducer(prod, s)
+ super().registerProducer(prod, s)
def getUser(self):
return None
@@ -191,7 +191,7 @@ class TestSmartHTTPRefsResource(ErrorTestMixin, TestCase):
request_method = 'GET'
def setUp(self):
- super(TestSmartHTTPRefsResource, self).setUp()
+ super().setUp()
self.root = FakeRoot()
self.request = LessDummyRequest([b''])
self.request.method = b'GET'
@@ -283,7 +283,7 @@ class TestSmartHTTPCommandResource(ErrorTestMixin, TestCase):
run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=5)
def setUp(self):
- super(TestSmartHTTPCommandResource, self).setUp()
+ super().setUp()
self.root = FakeRoot()
self.request = LessDummyRequest([''])
self.request.method = b'POST'
@@ -317,7 +317,7 @@ class TestSmartHTTPCommandResource(ErrorTestMixin, TestCase):
class TestHTTPAuthLoginResource(TestCase):
"""Unit tests for login resource."""
def setUp(self):
- super(TestHTTPAuthLoginResource, self).setUp()
+ super().setUp()
self.root = FakeRoot(self.useFixture(TempDir()).path)
self.root.cgit_secret = b'dont-tell-anyone shuuu'
@@ -382,7 +382,7 @@ class TestHTTPAuthRootResource(TestCase):
run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=5)
def setUp(self):
- super(TestHTTPAuthRootResource, self).setUp()
+ super().setUp()
self.root = root = FakeRoot(self.useFixture(TempDir()).path)
self.virtinfo = virtinfo = FakeVirtInfoService(allowNone=True)
virtinfo_listener = default_reactor.listenTCP(0, server.Site(virtinfo))
