Remove Python 2 code from the tests & refactor (#7320)

- Refactor Classes which inherit from `object`.
- Remove `import print_function from __future__`.
- Remove assignments to `__revision__` from the functional test module when it is never used throughout the module.

Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/tests/regrtest_data/classdoc_usage.py b/tests/regrtest_data/classdoc_usage.py
index 2d9df51cd..b12bafa72 100644
--- a/tests/regrtest_data/classdoc_usage.py
+++ b/tests/regrtest_data/classdoc_usage.py
@@ -1,9 +1,8 @@
 """ds"""
 
 __revision__ = None
-# pylint: disable=useless-object-inheritance
 
-class SomeClass(object):
+class SomeClass:
     """cds"""
     doc = __doc__
 
diff --git a/tests/regrtest_data/func_block_disable_msg.py b/tests/regrtest_data/func_block_disable_msg.py
index 8a94ab4f3..a1dd9a627 100644
--- a/tests/regrtest_data/func_block_disable_msg.py
+++ b/tests/regrtest_data/func_block_disable_msg.py
@@ -1,8 +1,8 @@
-# pylint: disable=C0302,bare-except, useless-object-inheritance
+# pylint: disable=C0302,bare-except
 """pylint option block-disable"""
 from __future__ import print_function
 
-class Foo(object):
+class Foo:
     """block-disable test"""
 
     def __init__(self):
@@ -110,7 +110,7 @@ class Foo(object):
         print(self.blu)
 
 
-class ClassLevelMessage(object):
+class ClassLevelMessage:
     """shouldn't display to much attributes/not enough methods messages
     """
     # pylint: disable=R0902,R0903