From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 30 Nov 2023 00:22:18 +0000 (+1300)
Subject: python: Correct Python2 super() calls that called the wrong class
X-Git-Tag: talloc-2.4.2~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42e7828563220f7c7f281f68c3cdcd529e6f6ef8;p=thirdparty%2Fsamba.git

python: Correct Python2 super() calls that called the wrong class

These changes have been checked as safe as skipping a superclass
has no actual impact.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/samba/tests/blackbox/mdsearch.py b/python/samba/tests/blackbox/mdsearch.py
index 1f72c4e3948..8d67090e182 100644
--- a/python/samba/tests/blackbox/mdsearch.py
+++ b/python/samba/tests/blackbox/mdsearch.py
@@ -83,7 +83,7 @@ class MdfindBlackboxTests(BlackboxTestCase):
             f.close()
 
     def tearDown(self):
-        super(BlackboxTestCase, self).tearDown()
+        super().tearDown()
         for file in testfiles:
             os.remove("%s/%s" % (self.sharepath, file))
 
diff --git a/python/samba/tests/cred_opt.py b/python/samba/tests/cred_opt.py
index 5bc7a831da7..0e28b67d196 100644
--- a/python/samba/tests/cred_opt.py
+++ b/python/samba/tests/cred_opt.py
@@ -66,7 +66,7 @@ class CredentialsOptionsTests(samba.tests.TestCase):
         self.assertIn(clear_password_opt, setproctitle.getproctitle())
 
     def tearDown(self):
-        super(samba.tests.TestCase, self).tearDown()
+        super().tearDown()
         setproctitle.setproctitle(self.old_proctitle)
         sys.argv.pop()
 
diff --git a/python/samba/tests/dcerpc/mdssvc.py b/python/samba/tests/dcerpc/mdssvc.py
index 31c3ba9ae52..1d53676dea3 100644
--- a/python/samba/tests/dcerpc/mdssvc.py
+++ b/python/samba/tests/dcerpc/mdssvc.py
@@ -96,7 +96,7 @@ class MdssvcTests(RpcInterfaceTestCase):
             f.close()
 
     def tearDown(self):
-        super(RpcInterfaceTestCase, self).tearDown()
+        super().tearDown()
         for file in testfiles:
             os.remove("%s/%s" % (self.sharepath, file))
 
diff --git a/python/samba/tests/dcerpc/raw_testcase.py b/python/samba/tests/dcerpc/raw_testcase.py
index 81ca9b1c6ce..743fa0f38c1 100644
--- a/python/samba/tests/dcerpc/raw_testcase.py
+++ b/python/samba/tests/dcerpc/raw_testcase.py
@@ -170,7 +170,7 @@ class RawDCERPCTest(TestCase):
 
     def tearDown(self):
         self._disconnect("tearDown")
-        super(TestCase, self).tearDown()
+        super().tearDown()
 
     def noop(self):
         return