diff options
144 files changed, 154 insertions, 144 deletions
diff --git a/pylint/checkers/classes.py b/pylint/checkers/classes.py index e7f920880..e8e2675bb 100644 --- a/pylint/checkers/classes.py +++ b/pylint/checkers/classes.py @@ -538,7 +538,7 @@ MSGS = { 'single-string-used-for-slots', 'Used when a class __slots__ is a simple string, rather ' 'than an iterable.'), - 'R0204': ('Class %r inherits from object, can be safely removed from bases in python3', + 'R0205': ('Class %r inherits from object, can be safely removed from bases in python3', 'useless-object-inheritance', 'Used when a class inherit from object, which under python3 is implicit, ' 'hence can be safely removed from bases.') diff --git a/pylint/test/data/clientmodule_test.py b/pylint/test/data/clientmodule_test.py index e520e88ec..40db2e77e 100644 --- a/pylint/test/data/clientmodule_test.py +++ b/pylint/test/data/clientmodule_test.py @@ -1,7 +1,7 @@ """ docstring for file clientmodule.py """ from data.suppliermodule_test import Interface, DoNothing -class Ancestor(object): +class Ancestor: """ Ancestor method """ __implements__ = (Interface,) cls_member = DoNothing() diff --git a/pylint/test/extensions/data/docstring.py b/pylint/test/extensions/data/docstring.py index 170c12894..0ca7b0d61 100644 --- a/pylint/test/extensions/data/docstring.py +++ b/pylint/test/extensions/data/docstring.py @@ -10,7 +10,7 @@ def function2(): """Test Ok""" pass -class FFFF(object): +class FFFF: """ Test Docstring First Line Empty """ diff --git a/pylint/test/extensions/data/redefined.py b/pylint/test/extensions/data/redefined.py index aae072514..7db75e8ed 100644 --- a/pylint/test/extensions/data/redefined.py +++ b/pylint/test/extensions/data/redefined.py @@ -1,6 +1,6 @@ """Checks variable types aren't redefined within a method or a function""" -# pylint: disable=too-few-public-methods,missing-docstring,unused-variable,invalid-name +# pylint: disable=too-few-public-methods,missing-docstring,unused-variable,invalid-name, useless-object-inheritance _OK = True diff --git a/pylint/test/functional/abstract_abc_methods.py b/pylint/test/functional/abstract_abc_methods.py index 31ac2ae06..d174669a5 100644 --- a/pylint/test/functional/abstract_abc_methods.py +++ b/pylint/test/functional/abstract_abc_methods.py @@ -1,5 +1,5 @@ """ This should not warn about `prop` being abstract in Child """
-# pylint: disable=too-few-public-methods, no-absolute-import,metaclass-assignment
+# pylint: disable=too-few-public-methods, no-absolute-import,metaclass-assignment, useless-object-inheritance
import abc
diff --git a/pylint/test/functional/abstract_class_instantiated_in_class.py b/pylint/test/functional/abstract_class_instantiated_in_class.py index 9402c1277..a91fde579 100644 --- a/pylint/test/functional/abstract_class_instantiated_in_class.py +++ b/pylint/test/functional/abstract_class_instantiated_in_class.py @@ -1,5 +1,5 @@ """Don't warn if the class is instantiated in its own body."""
-# pylint: disable=missing-docstring
+# pylint: disable=missing-docstring, useless-object-inheritance
import abc
diff --git a/pylint/test/functional/abstract_class_instantiated_py2.py b/pylint/test/functional/abstract_class_instantiated_py2.py index 58c74e164..ba34d2641 100644 --- a/pylint/test/functional/abstract_class_instantiated_py2.py +++ b/pylint/test/functional/abstract_class_instantiated_py2.py @@ -3,7 +3,7 @@ abstract methods. """ -# pylint: disable=too-few-public-methods, missing-docstring +# pylint: disable=too-few-public-methods, missing-docstring, useless-object-inheritance # pylint: disable=no-absolute-import, metaclass-assignment # pylint: disable=abstract-method, import-error, wildcard-import diff --git a/pylint/test/functional/abstract_class_instantiated_py3.py b/pylint/test/functional/abstract_class_instantiated_py3.py index d30fb1eff..c027833e7 100644 --- a/pylint/test/functional/abstract_class_instantiated_py3.py +++ b/pylint/test/functional/abstract_class_instantiated_py3.py @@ -4,7 +4,7 @@ abstract methods. """ # pylint: disable=too-few-public-methods, missing-docstring -# pylint: disable=abstract-method, import-error +# pylint: disable=abstract-method, import-error, useless-object-inheritance import abc import weakref diff --git a/pylint/test/functional/abstract_method_py2.py b/pylint/test/functional/abstract_method_py2.py index eac4943f9..54fd1f952 100644 --- a/pylint/test/functional/abstract_method_py2.py +++ b/pylint/test/functional/abstract_method_py2.py @@ -2,7 +2,7 @@ from __future__ import print_function # pylint: disable=missing-docstring, no-init, no-self-use -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance import abc class Abstract(object): diff --git a/pylint/test/functional/abstract_method_py3.py b/pylint/test/functional/abstract_method_py3.py index 090b289a8..f4e3dd568 100644 --- a/pylint/test/functional/abstract_method_py3.py +++ b/pylint/test/functional/abstract_method_py3.py @@ -2,7 +2,7 @@ from __future__ import print_function # pylint: disable=missing-docstring, no-init, no-self-use -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance import abc class Abstract(object): diff --git a/pylint/test/functional/access_member_before_definition.py b/pylint/test/functional/access_member_before_definition.py index 53294fbce..d8a97b4c7 100644 --- a/pylint/test/functional/access_member_before_definition.py +++ b/pylint/test/functional/access_member_before_definition.py @@ -1,5 +1,5 @@ # pylint: disable=missing-docstring,too-few-public-methods,invalid-name -# pylint: disable=attribute-defined-outside-init +# pylint: disable=attribute-defined-outside-init, useless-object-inheritance class Aaaa(object): """class with attributes defined in wrong order""" diff --git a/pylint/test/functional/access_to__name__.py b/pylint/test/functional/access_to__name__.py index 6f5a39ec7..1d96ce5eb 100644 --- a/pylint/test/functional/access_to__name__.py +++ b/pylint/test/functional/access_to__name__.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods, print-statement +# pylint: disable=too-few-public-methods, print-statement, useless-object-inheritance """test access to __name__ gives undefined member on new/old class instances but not on new/old class object """ diff --git a/pylint/test/functional/access_to_protected_members.py b/pylint/test/functional/access_to_protected_members.py index b1dc2e8df..1c97a3b50 100644 --- a/pylint/test/functional/access_to_protected_members.py +++ b/pylint/test/functional/access_to_protected_members.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods, W0231, print-statement +# pylint: disable=too-few-public-methods, W0231, print-statement, useless-object-inheritance # pylint: disable=no-classmethod-decorator """Test external access to protected class members.""" from __future__ import print_function diff --git a/pylint/test/functional/arguments.py b/pylint/test/functional/arguments.py index c480b401b..ea833ebb7 100644 --- a/pylint/test/functional/arguments.py +++ b/pylint/test/functional/arguments.py @@ -1,5 +1,5 @@ # pylint: disable=too-few-public-methods, no-absolute-import,missing-docstring,import-error,wrong-import-position -# pylint: disable=wrong-import-order +# pylint: disable=wrong-import-order, useless-object-inheritance def decorator(fun): """Decorator""" diff --git a/pylint/test/functional/arguments_differ.py b/pylint/test/functional/arguments_differ.py index b9fe269a8..61959fd22 100644 --- a/pylint/test/functional/arguments_differ.py +++ b/pylint/test/functional/arguments_differ.py @@ -1,5 +1,5 @@ """Test that we are emitting arguments-differ when the arguments are different."""
-# pylint: disable=missing-docstring, too-few-public-methods, unused-argument,useless-super-delegation
+# pylint: disable=missing-docstring, too-few-public-methods, unused-argument,useless-super-delegation, useless-object-inheritance
class Parent(object):
diff --git a/pylint/test/functional/assigning_non_slot.py b/pylint/test/functional/assigning_non_slot.py index 2e0da42e0..a57a8b3b4 100644 --- a/pylint/test/functional/assigning_non_slot.py +++ b/pylint/test/functional/assigning_non_slot.py @@ -1,7 +1,7 @@ """ Checks assigning attributes not found in class slots will trigger assigning-non-slot warning. """ -# pylint: disable=too-few-public-methods, no-init, missing-docstring, no-absolute-import, import-error +# pylint: disable=too-few-public-methods, no-init, missing-docstring, no-absolute-import, import-error, useless-object-inheritance from collections import deque from missing import Unknown diff --git a/pylint/test/functional/async_functions.py b/pylint/test/functional/async_functions.py index 8375b8988..f8427d073 100644 --- a/pylint/test/functional/async_functions.py +++ b/pylint/test/functional/async_functions.py @@ -1,6 +1,6 @@ """Check that Python 3.5's async functions are properly analyzed by Pylint.""" # pylint: disable=missing-docstring,invalid-name,too-few-public-methods -# pylint: disable=using-constant-test +# pylint: disable=using-constant-test, useless-object-inheritance async def next(): # [redefined-builtin] pass @@ -61,4 +61,3 @@ async def func(a, a, b=[]): # +1: [empty-docstring, blacklisted-name] async def foo(): "" -
\ No newline at end of file diff --git a/pylint/test/functional/attribute_defined_outside_init.py b/pylint/test/functional/attribute_defined_outside_init.py index 912bc459f..826b5d68b 100644 --- a/pylint/test/functional/attribute_defined_outside_init.py +++ b/pylint/test/functional/attribute_defined_outside_init.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods,invalid-name +# pylint: disable=missing-docstring,too-few-public-methods,invalid-name, useless-object-inheritance class A(object): diff --git a/pylint/test/functional/bad_continuation_tabs.py b/pylint/test/functional/bad_continuation_tabs.py index 4c42b424c..a668dc704 100644 --- a/pylint/test/functional/bad_continuation_tabs.py +++ b/pylint/test/functional/bad_continuation_tabs.py @@ -1,5 +1,5 @@ """Regression test case for bad-continuation with tabs""" -# pylint: disable=too-few-public-methods,missing-docstring,invalid-name,unused-variable +# pylint: disable=too-few-public-methods,missing-docstring,invalid-name,unused-variable, useless-object-inheritance # Various alignment for brackets # Issue 638 diff --git a/pylint/test/functional/bad_reversed_sequence.py b/pylint/test/functional/bad_reversed_sequence.py index 6deb79570..fd90f4010 100644 --- a/pylint/test/functional/bad_reversed_sequence.py +++ b/pylint/test/functional/bad_reversed_sequence.py @@ -1,5 +1,5 @@ """ Checks that reversed() receive proper argument """ -# pylint: disable=missing-docstring +# pylint: disable=missing-docstring, useless-object-inheritance # pylint: disable=too-few-public-methods,no-self-use,no-absolute-import from collections import deque diff --git a/pylint/test/functional/bad_staticmethod_argument.py b/pylint/test/functional/bad_staticmethod_argument.py index a71a40e58..e73bf3dcd 100644 --- a/pylint/test/functional/bad_staticmethod_argument.py +++ b/pylint/test/functional/bad_staticmethod_argument.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, no-staticmethod-decorator +# pylint: disable=missing-docstring, no-staticmethod-decorator, useless-object-inheritance class Abcd(object): diff --git a/pylint/test/functional/class_members_py27.py b/pylint/test/functional/class_members_py27.py index 67b745891..584faa5e8 100644 --- a/pylint/test/functional/class_members_py27.py +++ b/pylint/test/functional/class_members_py27.py @@ -1,5 +1,5 @@ """ Various tests for class members access. """
-# pylint: disable=R0903,print-statement,no-absolute-import, metaclass-assignment,import-error,no-init,missing-docstring, wrong-import-order,wrong-import-position
+# pylint: disable=R0903,print-statement,no-absolute-import, metaclass-assignment,import-error,no-init,missing-docstring, wrong-import-order,wrong-import-position, useless-object-inheritance
from missing import Missing
class MyClass(object):
"""class docstring"""
diff --git a/pylint/test/functional/class_members_py30.py b/pylint/test/functional/class_members_py30.py index ac1d9f349..49eb93a2a 100644 --- a/pylint/test/functional/class_members_py30.py +++ b/pylint/test/functional/class_members_py30.py @@ -1,5 +1,5 @@ """ Various tests for class members access. """
-# pylint: disable=R0903,import-error,no-init,missing-docstring, wrong-import-position,wrong-import-order
+# pylint: disable=R0903,import-error,no-init,missing-docstring, wrong-import-position,wrong-import-order, useless-object-inheritance
from missing import Missing
class MyClass(object):
"""class docstring"""
diff --git a/pylint/test/functional/class_scope.py b/pylint/test/functional/class_scope.py index dfc8dd83d..309ebd6da 100644 --- a/pylint/test/functional/class_scope.py +++ b/pylint/test/functional/class_scope.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903,W0232 +# pylint: disable=R0903,W0232, useless-object-inheritance """check for scope problems""" __revision__ = None diff --git a/pylint/test/functional/comparison_with_callable.py b/pylint/test/functional/comparison_with_callable.py index 21d37edc3..ea7024c1b 100644 --- a/pylint/test/functional/comparison_with_callable.py +++ b/pylint/test/functional/comparison_with_callable.py @@ -1,4 +1,4 @@ -# pylint: disable = blacklisted-name, missing-docstring, useless-return, misplaced-comparison-constant, invalid-name, no-self-use, line-too-long +# pylint: disable = blacklisted-name, missing-docstring, useless-return, misplaced-comparison-constant, invalid-name, no-self-use, line-too-long, useless-object-inheritance def foo(): return None diff --git a/pylint/test/functional/confidence_filter.py b/pylint/test/functional/confidence_filter.py index b934c9d35..42351998d 100644 --- a/pylint/test/functional/confidence_filter.py +++ b/pylint/test/functional/confidence_filter.py @@ -1,5 +1,6 @@ """Test for the confidence filter.""" from __future__ import print_function +# pylint: disable=useless-object-inheritance class Client(object): """use provider class""" diff --git a/pylint/test/functional/confidence_filter.txt b/pylint/test/functional/confidence_filter.txt index 50a3767cd..3dbb2eaf2 100644 --- a/pylint/test/functional/confidence_filter.txt +++ b/pylint/test/functional/confidence_filter.txt @@ -1 +1 @@ -no-member:15::Instance of 'Client' has no 'foo' member:INFERENCE +no-member:16::Instance of 'Client' has no 'foo' member:INFERENCE diff --git a/pylint/test/functional/consider_iterating_dictionary.py b/pylint/test/functional/consider_iterating_dictionary.py index 9f4201171..180ee3bd3 100644 --- a/pylint/test/functional/consider_iterating_dictionary.py +++ b/pylint/test/functional/consider_iterating_dictionary.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, expression-not-assigned, too-few-public-methods, no-member, import-error, no-self-use, line-too-long +# pylint: disable=missing-docstring, expression-not-assigned, too-few-public-methods, no-member, import-error, no-self-use, line-too-long, useless-object-inheritance from unknown import Unknown diff --git a/pylint/test/functional/crash_missing_module_type.py b/pylint/test/functional/crash_missing_module_type.py index a471ad8ad..308606ff4 100644 --- a/pylint/test/functional/crash_missing_module_type.py +++ b/pylint/test/functional/crash_missing_module_type.py @@ -1,7 +1,7 @@ """ Test for a crash found in
https://bitbucket.org/logilab/astroid/issue/45/attributeerror-module-object-has-no#comment-11944673
"""
-# pylint: disable=no-init, invalid-name, too-few-public-methods, redefined-outer-name
+# pylint: disable=no-init, invalid-name, too-few-public-methods, redefined-outer-name, useless-object-inheritance
def decor(trop):
""" decorator """
return trop
diff --git a/pylint/test/functional/ctor_arguments.py b/pylint/test/functional/ctor_arguments.py index c4f4cee9b..d9a9944a6 100644 --- a/pylint/test/functional/ctor_arguments.py +++ b/pylint/test/functional/ctor_arguments.py @@ -2,7 +2,7 @@ Based on test/functional/arguments.py """ -# pylint: disable=C0111,R0903,W0231 +# pylint: disable=C0111,R0903,W0231, useless-object-inheritance class Class1Arg(object): diff --git a/pylint/test/functional/docstrings.py b/pylint/test/functional/docstrings.py index 85278dd8f..b525c0cb2 100644 --- a/pylint/test/functional/docstrings.py +++ b/pylint/test/functional/docstrings.py @@ -1,4 +1,4 @@ -# pylint: disable=R0201
+# pylint: disable=R0201, useless-object-inheritance
# -1: [missing-docstring]
from __future__ import print_function
diff --git a/pylint/test/functional/function_redefined.py b/pylint/test/functional/function_redefined.py index ebccf1785..d826a0f73 100644 --- a/pylint/test/functional/function_redefined.py +++ b/pylint/test/functional/function_redefined.py @@ -1,4 +1,4 @@ -# pylint: disable=R0201,missing-docstring,using-constant-test,unused-import,wrong-import-position,reimported +# pylint: disable=R0201,missing-docstring,using-constant-test,unused-import,wrong-import-position,reimported, useless-object-inheritance from __future__ import division __revision__ = '' diff --git a/pylint/test/functional/generated_members.py b/pylint/test/functional/generated_members.py index 33ca0cdd4..802ebaf8f 100644 --- a/pylint/test/functional/generated_members.py +++ b/pylint/test/functional/generated_members.py @@ -1,5 +1,5 @@ """Test the generated-members config option.""" -# pylint: disable=pointless-statement, invalid-name +# pylint: disable=pointless-statement, invalid-name, useless-object-inheritance from __future__ import print_function from astroid import node_classes from pylint import checkers diff --git a/pylint/test/functional/genexp_in_class_scope.py b/pylint/test/functional/genexp_in_class_scope.py index 47ac3471a..868cf6b79 100644 --- a/pylint/test/functional/genexp_in_class_scope.py +++ b/pylint/test/functional/genexp_in_class_scope.py @@ -1,4 +1,4 @@ -# pylint: disable=W0232,R0903, missing-docstring +# pylint: disable=W0232,R0903, missing-docstring, useless-object-inheritance """Class scope must be handled correctly in genexps""" class MyClass(object): diff --git a/pylint/test/functional/inherit_non_class.py b/pylint/test/functional/inherit_non_class.py index 0929ed1db..ee9ef508c 100644 --- a/pylint/test/functional/inherit_non_class.py +++ b/pylint/test/functional/inherit_non_class.py @@ -1,7 +1,7 @@ """Test that inheriting from something which is not
a class emits a warning. """
-# pylint: disable=no-init, import-error, invalid-name, using-constant-test
+# pylint: disable=no-init, import-error, invalid-name, using-constant-test, useless-object-inheritance
# pylint: disable=missing-docstring, too-few-public-methods, no-absolute-import
from missing import Missing
diff --git a/pylint/test/functional/init_is_generator.py b/pylint/test/functional/init_is_generator.py index 882200c7c..17f96db30 100644 --- a/pylint/test/functional/init_is_generator.py +++ b/pylint/test/functional/init_is_generator.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods +# pylint: disable=missing-docstring,too-few-public-methods, useless-object-inheritance class SomeClass(object): def __init__(self): # [init-is-generator] diff --git a/pylint/test/functional/init_not_called.py b/pylint/test/functional/init_not_called.py index 71f09e484..2839e89b4 100644 --- a/pylint/test/functional/init_not_called.py +++ b/pylint/test/functional/init_not_called.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903,import-error,missing-docstring,wrong-import-position,useless-super-delegation +# pylint: disable=R0903,import-error,missing-docstring,wrong-import-position,useless-super-delegation, useless-object-inheritance """test for __init__ not called """ from __future__ import print_function diff --git a/pylint/test/functional/init_subclass_classmethod_py36.py b/pylint/test/functional/init_subclass_classmethod_py36.py index 13977e5a4..ad379705d 100644 --- a/pylint/test/functional/init_subclass_classmethod_py36.py +++ b/pylint/test/functional/init_subclass_classmethod_py36.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods, missing-docstring,no-init +# pylint: disable=too-few-public-methods, missing-docstring,no-init, useless-object-inheritance class PluginBase(object): subclasses = [] diff --git a/pylint/test/functional/invalid_exceptions_caught.py b/pylint/test/functional/invalid_exceptions_caught.py index 2b1dbacd8..252643446 100644 --- a/pylint/test/functional/invalid_exceptions_caught.py +++ b/pylint/test/functional/invalid_exceptions_caught.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods +# pylint: disable=missing-docstring, too-few-public-methods, useless-object-inheritance # pylint: disable=too-many-ancestors, no-absolute-import, import-error, multiple-imports,wrong-import-position from __future__ import print_function diff --git a/pylint/test/functional/invalid_exceptions_raised.py b/pylint/test/functional/invalid_exceptions_raised.py index aa3d0845c..74119a64f 100644 --- a/pylint/test/functional/invalid_exceptions_raised.py +++ b/pylint/test/functional/invalid_exceptions_raised.py @@ -1,4 +1,4 @@ -# pylint:disable=too-few-public-methods,old-style-class,no-init,import-error,missing-docstring, not-callable +# pylint:disable=too-few-public-methods,old-style-class,no-init,import-error,missing-docstring, not-callable, useless-object-inheritance """test pb with exceptions and old/new style classes""" diff --git a/pylint/test/functional/invalid_length_returned.py b/pylint/test/functional/invalid_length_returned.py index 7beb9aeac..e57db5290 100644 --- a/pylint/test/functional/invalid_length_returned.py +++ b/pylint/test/functional/invalid_length_returned.py @@ -1,6 +1,6 @@ """Check invalid value returned by __len__ """ -# pylint: disable=too-few-public-methods,missing-docstring,no-self-use,import-error +# pylint: disable=too-few-public-methods,missing-docstring,no-self-use,import-error, useless-object-inheritance import sys import six diff --git a/pylint/test/functional/invalid_metaclass.py b/pylint/test/functional/invalid_metaclass.py index d2c1afb29..c0e9d74be 100644 --- a/pylint/test/functional/invalid_metaclass.py +++ b/pylint/test/functional/invalid_metaclass.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods, import-error,unused-argument +# pylint: disable=missing-docstring, too-few-public-methods, import-error,unused-argument, useless-object-inheritance import abc diff --git a/pylint/test/functional/invalid_sequence_index.py b/pylint/test/functional/invalid_sequence_index.py index 0a624082f..b4473039f 100644 --- a/pylint/test/functional/invalid_sequence_index.py +++ b/pylint/test/functional/invalid_sequence_index.py @@ -1,5 +1,5 @@ """Errors for invalid sequence indices""" -# pylint: disable=too-few-public-methods, no-self-use, import-error, missing-docstring +# pylint: disable=too-few-public-methods, no-self-use, import-error, missing-docstring, useless-object-inheritance import six from unknown import Unknown diff --git a/pylint/test/functional/invalid_slice_index.py b/pylint/test/functional/invalid_slice_index.py index 7a7b6ab64..f2bc1d7cd 100644 --- a/pylint/test/functional/invalid_slice_index.py +++ b/pylint/test/functional/invalid_slice_index.py @@ -1,5 +1,5 @@ """Errors for invalid slice indices""" -# pylint: disable=too-few-public-methods, no-self-use,missing-docstring,expression-not-assigned +# pylint: disable=too-few-public-methods, no-self-use,missing-docstring,expression-not-assigned, useless-object-inheritance TESTLIST = [1, 2, 3] diff --git a/pylint/test/functional/invalid_unary_operand_type.py b/pylint/test/functional/invalid_unary_operand_type.py index ee49c2c7a..f2a0124f6 100644 --- a/pylint/test/functional/invalid_unary_operand_type.py +++ b/pylint/test/functional/invalid_unary_operand_type.py @@ -1,6 +1,6 @@ """Detect problems with invalid operands used on invalid objects."""
# pylint: disable=missing-docstring,too-few-public-methods,invalid-name
-# pylint: disable=unused-variable
+# pylint: disable=unused-variable, useless-object-inheritance
import collections
diff --git a/pylint/test/functional/iterable_context.py b/pylint/test/functional/iterable_context.py index d34207a1d..abe5cc6f3 100644 --- a/pylint/test/functional/iterable_context.py +++ b/pylint/test/functional/iterable_context.py @@ -2,7 +2,7 @@ Checks that primitive values are not used in an iterating/mapping context. """ -# pylint: disable=missing-docstring,invalid-name,too-few-public-methods,no-init,no-self-use,import-error,unused-argument,bad-mcs-method-argument,wrong-import-position,no-else-return +# pylint: disable=missing-docstring,invalid-name,too-few-public-methods,no-init,no-self-use,import-error,unused-argument,bad-mcs-method-argument,wrong-import-position,no-else-return, useless-object-inheritance from __future__ import print_function # primitives diff --git a/pylint/test/functional/iterable_context_py2.py b/pylint/test/functional/iterable_context_py2.py index 8687f84ab..22c60c174 100644 --- a/pylint/test/functional/iterable_context_py2.py +++ b/pylint/test/functional/iterable_context_py2.py @@ -1,7 +1,7 @@ """ Checks that iterable metaclasses are recognized by pylint. """ -# pylint: disable=missing-docstring,too-few-public-methods,no-init,no-self-use,unused-argument,bad-mcs-method-argument +# pylint: disable=missing-docstring,too-few-public-methods,no-init,no-self-use,unused-argument,bad-mcs-method-argument, useless-object-inheritance # metaclasses as iterables class Meta(type): diff --git a/pylint/test/functional/keyword_arg_before_vararg.py b/pylint/test/functional/keyword_arg_before_vararg.py index 7c037d7e2..75beb6ea5 100644 --- a/pylint/test/functional/keyword_arg_before_vararg.py +++ b/pylint/test/functional/keyword_arg_before_vararg.py @@ -1,7 +1,7 @@ """Unittests for W1125 (kw args before *args)""" from __future__ import absolute_import, print_function -# pylint: disable=unused-argument +# pylint: disable=unused-argument, useless-object-inheritance def check_kwargs_before_args(param1, param2=2, *args): # [keyword-arg-before-vararg] """docstring""" pass diff --git a/pylint/test/functional/mapping_context.py b/pylint/test/functional/mapping_context.py index 814ce44b8..6b3a13573 100644 --- a/pylint/test/functional/mapping_context.py +++ b/pylint/test/functional/mapping_context.py @@ -1,7 +1,7 @@ """ Checks that only valid values are used in a mapping context. """ -# pylint: disable=missing-docstring,invalid-name,too-few-public-methods,no-self-use,import-error,wrong-import-position +# pylint: disable=missing-docstring,invalid-name,too-few-public-methods,no-self-use,import-error,wrong-import-position, useless-object-inheritance from __future__ import print_function diff --git a/pylint/test/functional/mapping_context_py2.py b/pylint/test/functional/mapping_context_py2.py index 765314dc0..f5cdc753d 100644 --- a/pylint/test/functional/mapping_context_py2.py +++ b/pylint/test/functional/mapping_context_py2.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,invalid-name,too-few-public-methods,no-self-use,bad-mcs-method-argument +# pylint: disable=missing-docstring,invalid-name,too-few-public-methods,no-self-use,bad-mcs-method-argument, useless-object-inheritance from __future__ import print_function diff --git a/pylint/test/functional/member_checks.py b/pylint/test/functional/member_checks.py index 0bae2648d..d4aef7c5f 100644 --- a/pylint/test/functional/member_checks.py +++ b/pylint/test/functional/member_checks.py @@ -1,4 +1,4 @@ -# pylint: disable=print-statement,missing-docstring,no-self-use,too-few-public-methods,bare-except,broad-except +# pylint: disable=print-statement,missing-docstring,no-self-use,too-few-public-methods,bare-except,broad-except, useless-object-inheritance # pylint: disable=using-constant-test,expression-not-assigned, assigning-non-slot, unused-variable,pointless-statement from __future__ import print_function import six diff --git a/pylint/test/functional/member_checks_hints.py b/pylint/test/functional/member_checks_hints.py index bd6bd3746..407c522b5 100644 --- a/pylint/test/functional/member_checks_hints.py +++ b/pylint/test/functional/member_checks_hints.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods, pointless-statement +# pylint: disable=missing-docstring, too-few-public-methods, pointless-statement, useless-object-inheritance class Parent(object): diff --git a/pylint/test/functional/member_checks_no_hints.py b/pylint/test/functional/member_checks_no_hints.py index bd6bd3746..407c522b5 100644 --- a/pylint/test/functional/member_checks_no_hints.py +++ b/pylint/test/functional/member_checks_no_hints.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods, pointless-statement +# pylint: disable=missing-docstring, too-few-public-methods, pointless-statement, useless-object-inheritance class Parent(object): diff --git a/pylint/test/functional/membership_protocol.py b/pylint/test/functional/membership_protocol.py index 5adb76f32..3401f4bb4 100644 --- a/pylint/test/functional/membership_protocol.py +++ b/pylint/test/functional/membership_protocol.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,pointless-statement,expression-not-assigned,too-few-public-methods,import-error,no-init,wrong-import-position,no-else-return, comparison-with-itself +# pylint: disable=missing-docstring,pointless-statement,expression-not-assigned,too-few-public-methods,import-error,no-init,wrong-import-position,no-else-return, comparison-with-itself, useless-object-inheritance # standard types 1 in [1, 2, 3] diff --git a/pylint/test/functional/membership_protocol_py2.py b/pylint/test/functional/membership_protocol_py2.py index 1a0163779..8a569c36b 100644 --- a/pylint/test/functional/membership_protocol_py2.py +++ b/pylint/test/functional/membership_protocol_py2.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods,no-init,no-self-use,unused-argument,pointless-statement,expression-not-assigned,undefined-variable +# pylint: disable=missing-docstring,too-few-public-methods,no-init,no-self-use,unused-argument,pointless-statement,expression-not-assigned,undefined-variable, useless-object-inheritance # metaclasses that support membership test protocol class MetaIterable(type): diff --git a/pylint/test/functional/method_hidden.py b/pylint/test/functional/method_hidden.py index a0ee991cb..ac641e98d 100644 --- a/pylint/test/functional/method_hidden.py +++ b/pylint/test/functional/method_hidden.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods,print-statement +# pylint: disable=too-few-public-methods,print-statement, useless-object-inheritance """check method hidding ancestor attribute """ from __future__ import print_function diff --git a/pylint/test/functional/misplaced_bare_raise.py b/pylint/test/functional/misplaced_bare_raise.py index a6eb56669..3a11aaee8 100644 --- a/pylint/test/functional/misplaced_bare_raise.py +++ b/pylint/test/functional/misplaced_bare_raise.py @@ -1,5 +1,5 @@ # pylint: disable=missing-docstring, broad-except, unreachable, try-except-raise
-# pylint: disable=unused-variable, too-few-public-methods, invalid-name
+# pylint: disable=unused-variable, too-few-public-methods, invalid-name, useless-object-inheritance
try:
raise # [misplaced-bare-raise]
diff --git a/pylint/test/functional/misplaced_comparison_constant.py b/pylint/test/functional/misplaced_comparison_constant.py index 45a03d1e1..29f2b1ed8 100644 --- a/pylint/test/functional/misplaced_comparison_constant.py +++ b/pylint/test/functional/misplaced_comparison_constant.py @@ -1,6 +1,6 @@ """Check that the constants are on the right side of the comparisons""" -# pylint: disable=singleton-comparison, missing-docstring, too-few-public-methods +# pylint: disable=singleton-comparison, missing-docstring, too-few-public-methods, useless-object-inheritance class MyClass(object): def __init__(self): diff --git a/pylint/test/functional/missing_docstring.py b/pylint/test/functional/missing_docstring.py index 2d6f1fd9b..657af5c7e 100644 --- a/pylint/test/functional/missing_docstring.py +++ b/pylint/test/functional/missing_docstring.py @@ -1,5 +1,5 @@ # [missing-docstring]
-# pylint: disable=too-few-public-methods
+# pylint: disable=too-few-public-methods, useless-object-inheritance
def public_documented():
"""It has a docstring."""
diff --git a/pylint/test/functional/missing_self_argument.py b/pylint/test/functional/missing_self_argument.py index 6477fcf4b..79ae34879 100644 --- a/pylint/test/functional/missing_self_argument.py +++ b/pylint/test/functional/missing_self_argument.py @@ -1,4 +1,5 @@ """Checks that missing self in method defs don't crash Pylint.""" +# pylint: disable=useless-object-inheritance diff --git a/pylint/test/functional/missing_self_argument.txt b/pylint/test/functional/missing_self_argument.txt index 1deef1862..9a47c8914 100644 --- a/pylint/test/functional/missing_self_argument.txt +++ b/pylint/test/functional/missing_self_argument.txt @@ -1,6 +1,6 @@ -no-method-argument:11:MyClass.method:Method has no argument -no-method-argument:13:MyClass.met:"""Method has no argument +no-method-argument:12:MyClass.method:Method has no argument +no-method-argument:14:MyClass.met:"""Method has no argument "" " -no-method-argument:14:MyClass.setup:Method has no argument -undefined-variable:16:MyClass.setup:Undefined variable 'self' +no-method-argument:15:MyClass.setup:Method has no argument +undefined-variable:17:MyClass.setup:Undefined variable 'self' diff --git a/pylint/test/functional/monkeypatch_method.py b/pylint/test/functional/monkeypatch_method.py index e0291149a..e8bd03aa7 100644 --- a/pylint/test/functional/monkeypatch_method.py +++ b/pylint/test/functional/monkeypatch_method.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods +# pylint: disable=missing-docstring,too-few-public-methods, useless-object-inheritance '''Test that a function is considered a method when looked up through a class.''' class Clazz(object): diff --git a/pylint/test/functional/name_styles.py b/pylint/test/functional/name_styles.py index dec5c613f..b86caf5d4 100644 --- a/pylint/test/functional/name_styles.py +++ b/pylint/test/functional/name_styles.py @@ -1,5 +1,5 @@ """Test for the invalid-name warning.""" -# pylint: disable=no-absolute-import +# pylint: disable=no-absolute-import, useless-object-inheritance from __future__ import print_function import abc import collections diff --git a/pylint/test/functional/names_in__all__.py b/pylint/test/functional/names_in__all__.py index 1118c2662..198334c91 100644 --- a/pylint/test/functional/names_in__all__.py +++ b/pylint/test/functional/names_in__all__.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods,no-self-use, no-absolute-import,import-error +# pylint: disable=too-few-public-methods,no-self-use, no-absolute-import,import-error, useless-object-inheritance """Test Pylint's use of __all__. * NonExistant is not defined in this module, and it is listed in diff --git a/pylint/test/functional/newstyle__slots__.py b/pylint/test/functional/newstyle__slots__.py index 306d6a142..0c992e3e7 100644 --- a/pylint/test/functional/newstyle__slots__.py +++ b/pylint/test/functional/newstyle__slots__.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """test __slots__ on old style class""" diff --git a/pylint/test/functional/newstyle_properties.py b/pylint/test/functional/newstyle_properties.py index 110fa3b40..4bdb2a51f 100644 --- a/pylint/test/functional/newstyle_properties.py +++ b/pylint/test/functional/newstyle_properties.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance """Test properties on old style classes and property.setter/deleter usage""" diff --git a/pylint/test/functional/no_classmethod_decorator.py b/pylint/test/functional/no_classmethod_decorator.py index b9e51cba0..66cc0b3c0 100644 --- a/pylint/test/functional/no_classmethod_decorator.py +++ b/pylint/test/functional/no_classmethod_decorator.py @@ -2,7 +2,7 @@ scope and if classmethod's argument is a member of the class """ -# pylint: disable=too-few-public-methods, using-constant-test, no-self-argument +# pylint: disable=too-few-public-methods, using-constant-test, no-self-argument, useless-object-inheritance class MyClass(object): """Some class""" diff --git a/pylint/test/functional/no_self_use.py b/pylint/test/functional/no_self_use.py index bb3919ec4..3d3cda1f2 100644 --- a/pylint/test/functional/no_self_use.py +++ b/pylint/test/functional/no_self_use.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903,W0232,missing-docstring +# pylint: disable=R0903,W0232,missing-docstring, useless-object-inheritance """test detection of method which could be a function""" from __future__ import print_function diff --git a/pylint/test/functional/no_staticmethod_decorator.py b/pylint/test/functional/no_staticmethod_decorator.py index 9acc5d749..d0e0effa4 100644 --- a/pylint/test/functional/no_staticmethod_decorator.py +++ b/pylint/test/functional/no_staticmethod_decorator.py @@ -2,7 +2,7 @@ scope and if static method's argument is a member of the class """ -# pylint: disable=too-few-public-methods, using-constant-test, no-method-argument +# pylint: disable=too-few-public-methods, using-constant-test, no-method-argument, useless-object-inheritance class MyClass(object): """Some class""" diff --git a/pylint/test/functional/non_iterator_returned.py b/pylint/test/functional/non_iterator_returned.py index d2fa75804..32486f722 100644 --- a/pylint/test/functional/non_iterator_returned.py +++ b/pylint/test/functional/non_iterator_returned.py @@ -1,6 +1,6 @@ """Check non-iterators returned by __iter__ """ -# pylint: disable=too-few-public-methods, missing-docstring, no-self-use +# pylint: disable=too-few-public-methods, missing-docstring, no-self-use, useless-object-inheritance import six diff --git a/pylint/test/functional/nonlocal_without_binding.py b/pylint/test/functional/nonlocal_without_binding.py index f2702d775..be3c00371 100644 --- a/pylint/test/functional/nonlocal_without_binding.py +++ b/pylint/test/functional/nonlocal_without_binding.py @@ -1,5 +1,5 @@ """ Checks that reversed() receive proper argument """ -# pylint: disable=missing-docstring,invalid-name,unused-variable +# pylint: disable=missing-docstring,invalid-name,unused-variable, useless-object-inheritance # pylint: disable=too-few-public-methods,no-self-use,no-absolute-import def test(): diff --git a/pylint/test/functional/not_async_context_manager.py b/pylint/test/functional/not_async_context_manager.py index 647d10457..138d76dfa 100644 --- a/pylint/test/functional/not_async_context_manager.py +++ b/pylint/test/functional/not_async_context_manager.py @@ -1,5 +1,5 @@ """Test that an async context manager receives a proper object."""
-# pylint: disable=missing-docstring, import-error, too-few-public-methods
+# pylint: disable=missing-docstring, import-error, too-few-public-methods, useless-object-inheritance
import contextlib
from ala import Portocala
diff --git a/pylint/test/functional/not_callable.py b/pylint/test/functional/not_callable.py index 31b2cded9..d436d52bd 100644 --- a/pylint/test/functional/not_callable.py +++ b/pylint/test/functional/not_callable.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,no-self-use,too-few-public-methods,wrong-import-position +# pylint: disable=missing-docstring,no-self-use,too-few-public-methods,wrong-import-position, useless-object-inheritance REVISION = None diff --git a/pylint/test/functional/not_context_manager.py b/pylint/test/functional/not_context_manager.py index 3d56b6035..a59f5a200 100644 --- a/pylint/test/functional/not_context_manager.py +++ b/pylint/test/functional/not_context_manager.py @@ -1,7 +1,7 @@ """Tests that onjects used in a with statement implement context manager protocol""" # pylint: disable=too-few-public-methods, invalid-name, import-error, missing-docstring -# pylint: disable=no-init,wrong-import-position +# pylint: disable=no-init,wrong-import-position, useless-object-inheritance # Tests no messages for objects that implement the protocol class Manager(object): def __enter__(self): diff --git a/pylint/test/functional/not_in_loop.py b/pylint/test/functional/not_in_loop.py index e16fb20b0..3ea7573d2 100644 --- a/pylint/test/functional/not_in_loop.py +++ b/pylint/test/functional/not_in_loop.py @@ -1,6 +1,6 @@ """Test that not-in-loop is detected properly.""" # pylint: disable=missing-docstring, invalid-name, too-few-public-methods -# pylint: disable=useless-else-on-loop, using-constant-test +# pylint: disable=useless-else-on-loop, using-constant-test, useless-object-inheritance while True: def ala(): diff --git a/pylint/test/functional/raising_non_exception_py3.py b/pylint/test/functional/raising_non_exception_py3.py index f7013e240..7961c5220 100644 --- a/pylint/test/functional/raising_non_exception_py3.py +++ b/pylint/test/functional/raising_non_exception_py3.py @@ -3,7 +3,7 @@ Previously, it didn't, due to a bug in the check for bad-exception-context, which prevented further checking on the Raise node. """ -# pylint: disable=import-error, too-few-public-methods +# pylint: disable=import-error, too-few-public-methods, useless-object-inheritance from missing_module import missing diff --git a/pylint/test/functional/recursion_error_940.py b/pylint/test/functional/recursion_error_940.py index fb8d7c742..4a9f346cb 100644 --- a/pylint/test/functional/recursion_error_940.py +++ b/pylint/test/functional/recursion_error_940.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods +# pylint: disable=missing-docstring, too-few-public-methods, useless-object-inheritance import datetime diff --git a/pylint/test/functional/return_in_init.py b/pylint/test/functional/return_in_init.py index 0fc68b924..bf0aa064f 100644 --- a/pylint/test/functional/return_in_init.py +++ b/pylint/test/functional/return_in_init.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods,useless-return +# pylint: disable=missing-docstring,too-few-public-methods,useless-return, useless-object-inheritance class MyClass(object): diff --git a/pylint/test/functional/self_cls_assignment.py b/pylint/test/functional/self_cls_assignment.py index f9367d07b..4e63bb422 100644 --- a/pylint/test/functional/self_cls_assignment.py +++ b/pylint/test/functional/self_cls_assignment.py @@ -1,6 +1,6 @@ """Warning about assigning self/cls variable.""" from __future__ import print_function -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance class Foo(object): """Class with methods that check for self/cls assignment""" diff --git a/pylint/test/functional/signature_differs.py b/pylint/test/functional/signature_differs.py index bbffcf662..920611fd0 100644 --- a/pylint/test/functional/signature_differs.py +++ b/pylint/test/functional/signature_differs.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods, missing-docstring, no-self-use +# pylint: disable=too-few-public-methods, missing-docstring, no-self-use, useless-object-inheritance class Abcd(object): diff --git a/pylint/test/functional/singledispatch_functions.py b/pylint/test/functional/singledispatch_functions.py index 0199ddc18..cfd4d873c 100644 --- a/pylint/test/functional/singledispatch_functions.py +++ b/pylint/test/functional/singledispatch_functions.py @@ -1,5 +1,5 @@ # pylint: disable=missing-docstring,import-error,unused-import,assignment-from-no-return -# pylint: disable=invalid-name, too-few-public-methods +# pylint: disable=invalid-name, too-few-public-methods, useless-object-inheritance from __future__ import print_function from UNINFERABLE import uninferable_func diff --git a/pylint/test/functional/singledispatch_functions_py3.py b/pylint/test/functional/singledispatch_functions_py3.py index 0199ddc18..cfd4d873c 100644 --- a/pylint/test/functional/singledispatch_functions_py3.py +++ b/pylint/test/functional/singledispatch_functions_py3.py @@ -1,5 +1,5 @@ # pylint: disable=missing-docstring,import-error,unused-import,assignment-from-no-return -# pylint: disable=invalid-name, too-few-public-methods +# pylint: disable=invalid-name, too-few-public-methods, useless-object-inheritance from __future__ import print_function from UNINFERABLE import uninferable_func diff --git a/pylint/test/functional/slots_checks.py b/pylint/test/functional/slots_checks.py index 75510c420..800a45e2f 100644 --- a/pylint/test/functional/slots_checks.py +++ b/pylint/test/functional/slots_checks.py @@ -1,6 +1,6 @@ """ Checks that classes uses valid __slots__ """ -# pylint: disable=too-few-public-methods, missing-docstring, no-absolute-import +# pylint: disable=too-few-public-methods, missing-docstring, no-absolute-import, useless-object-inheritance # pylint: disable=using-constant-test, wrong-import-position, no-else-return from collections import deque diff --git a/pylint/test/functional/statement_without_effect.py b/pylint/test/functional/statement_without_effect.py index b1aaadf8c..eb87aca9d 100644 --- a/pylint/test/functional/statement_without_effect.py +++ b/pylint/test/functional/statement_without_effect.py @@ -1,5 +1,5 @@ """Test for statements without effects.""" -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance # +1:[pointless-string-statement] """inline doc string should use a separated message""" diff --git a/pylint/test/functional/statement_without_effect_py36.py b/pylint/test/functional/statement_without_effect_py36.py index ffc3d5e3c..59745ce2b 100644 --- a/pylint/test/functional/statement_without_effect_py36.py +++ b/pylint/test/functional/statement_without_effect_py36.py @@ -1,5 +1,5 @@ """Test for statements without effects.""" -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance class ClassLevelAttributeTest(object): diff --git a/pylint/test/functional/string_formatting.py b/pylint/test/functional/string_formatting.py index 400f8794f..7e60d9fd9 100644 --- a/pylint/test/functional/string_formatting.py +++ b/pylint/test/functional/string_formatting.py @@ -1,6 +1,6 @@ """test for Python 3 string formatting error
"""
-# pylint: disable=too-few-public-methods, import-error, unused-argument, line-too-long, no-absolute-import
+# pylint: disable=too-few-public-methods, import-error, unused-argument, line-too-long, no-absolute-import, useless-object-inheritance
import os
from missing import Missing
diff --git a/pylint/test/functional/super_checks.py b/pylint/test/functional/super_checks.py index 4bd65caba..c7afe04f3 100644 --- a/pylint/test/functional/super_checks.py +++ b/pylint/test/functional/super_checks.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods,import-error, no-absolute-import,missing-docstring +# pylint: disable=too-few-public-methods,import-error, no-absolute-import,missing-docstring, useless-object-inheritance # pylint: disable=useless-super-delegation,wrong-import-position,invalid-name, wrong-import-order from unknown import Missing diff --git a/pylint/test/functional/test_compile.py b/pylint/test/functional/test_compile.py index e70b60a72..d4a4ac2aa 100644 --- a/pylint/test/functional/test_compile.py +++ b/pylint/test/functional/test_compile.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, unused-variable, pointless-statement, too-few-public-methods +# pylint: disable=missing-docstring, unused-variable, pointless-statement, too-few-public-methods, useless-object-inheritance class WrapperClass(object): def method(self): diff --git a/pylint/test/functional/too_few_public_methods.py b/pylint/test/functional/too_few_public_methods.py index a6b9ed02d..0b300351c 100644 --- a/pylint/test/functional/too_few_public_methods.py +++ b/pylint/test/functional/too_few_public_methods.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring +# pylint: disable=missing-docstring, useless-object-inheritance from __future__ import print_function diff --git a/pylint/test/functional/too_many_ancestors.py b/pylint/test/functional/too_many_ancestors.py index 38d68bbc1..a0ae18a02 100644 --- a/pylint/test/functional/too_many_ancestors.py +++ b/pylint/test/functional/too_many_ancestors.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods +# pylint: disable=missing-docstring, too-few-public-methods, useless-object-inheritance class Aaaa(object): pass diff --git a/pylint/test/functional/too_many_instance_attributes.py b/pylint/test/functional/too_many_instance_attributes.py index b77efdb73..f6703e0b7 100644 --- a/pylint/test/functional/too_many_instance_attributes.py +++ b/pylint/test/functional/too_many_instance_attributes.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, too-few-public-methods +# pylint: disable=missing-docstring, too-few-public-methods, useless-object-inheritance class Aaaa(object): # [too-many-instance-attributes] diff --git a/pylint/test/functional/too_many_public_methods.py b/pylint/test/functional/too_many_public_methods.py index df6134f36..11b4b367d 100644 --- a/pylint/test/functional/too_many_public_methods.py +++ b/pylint/test/functional/too_many_public_methods.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring +# pylint: disable=missing-docstring, useless-object-inheritance class Aaaa(object): # [too-many-public-methods] diff --git a/pylint/test/functional/unbalanced_tuple_unpacking.py b/pylint/test/functional/unbalanced_tuple_unpacking.py index fb99d4a8a..afa217f40 100644 --- a/pylint/test/functional/unbalanced_tuple_unpacking.py +++ b/pylint/test/functional/unbalanced_tuple_unpacking.py @@ -2,7 +2,7 @@ from __future__ import absolute_import from functional.unpacking import unpack -# pylint: disable=using-constant-test +# pylint: disable=using-constant-test, useless-object-inheritance def do_stuff(): """This is not right.""" diff --git a/pylint/test/functional/undefined_variable.py b/pylint/test/functional/undefined_variable.py index 4e9b60246..a9f3ea2e5 100644 --- a/pylint/test/functional/undefined_variable.py +++ b/pylint/test/functional/undefined_variable.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, multiple-statements +# pylint: disable=missing-docstring, multiple-statements, useless-object-inheritance # pylint: disable=too-few-public-methods, no-init, no-self-use, old-style-class,bare-except,broad-except from __future__ import print_function DEFINED = 1 diff --git a/pylint/test/functional/undefined_variable_py30.py b/pylint/test/functional/undefined_variable_py30.py index b8927731f..3ccdfa635 100644 --- a/pylint/test/functional/undefined_variable_py30.py +++ b/pylint/test/functional/undefined_variable_py30.py @@ -1,7 +1,7 @@ """Test warnings about access to undefined variables for various Python 3 constructs. """ # pylint: disable=too-few-public-methods, no-init, no-self-use -# pylint: disable=wrong-import-position, invalid-metaclass +# pylint: disable=wrong-import-position, invalid-metaclass, useless-object-inheritance class Undefined: """ test various annotation problems. """ diff --git a/pylint/test/functional/unexpected_special_method_signature.py b/pylint/test/functional/unexpected_special_method_signature.py index 41f02e536..aba6811b9 100644 --- a/pylint/test/functional/unexpected_special_method_signature.py +++ b/pylint/test/functional/unexpected_special_method_signature.py @@ -1,7 +1,7 @@ """Test for special methods implemented incorrectly."""
# pylint: disable=missing-docstring, unused-argument, too-few-public-methods
-# pylint: disable=invalid-name,too-many-arguments,bad-staticmethod-argument
+# pylint: disable=invalid-name,too-many-arguments,bad-staticmethod-argument, useless-object-inheritance
class Invalid(object):
diff --git a/pylint/test/functional/unhashable_dict_key.py b/pylint/test/functional/unhashable_dict_key.py index 54b3065a5..1b469f3dd 100644 --- a/pylint/test/functional/unhashable_dict_key.py +++ b/pylint/test/functional/unhashable_dict_key.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,expression-not-assigned,too-few-public-methods,pointless-statement +# pylint: disable=missing-docstring,expression-not-assigned,too-few-public-methods,pointless-statement, useless-object-inheritance class Unhashable(object): diff --git a/pylint/test/functional/unneeded_not.py b/pylint/test/functional/unneeded_not.py index c2bbc9e7e..97acecd73 100644 --- a/pylint/test/functional/unneeded_not.py +++ b/pylint/test/functional/unneeded_not.py @@ -1,7 +1,7 @@ """Check exceeding negations in boolean expressions trigger warnings""" # pylint: disable=singleton-comparison,too-many-branches,too-few-public-methods,undefined-variable -# pylint: disable=literal-comparison, comparison-with-itself +# pylint: disable=literal-comparison, comparison-with-itself, useless-object-inheritance def unneeded_not(): """This is not ok """ diff --git a/pylint/test/functional/unpacking_non_sequence.py b/pylint/test/functional/unpacking_non_sequence.py index 7c1439b9a..06a840b58 100644 --- a/pylint/test/functional/unpacking_non_sequence.py +++ b/pylint/test/functional/unpacking_non_sequence.py @@ -1,7 +1,7 @@ """Check unpacking non-sequences in assignments. """ # pylint: disable=too-few-public-methods, invalid-name, attribute-defined-outside-init, unused-variable, no-absolute-import -# pylint: disable=using-constant-test, no-init, missing-docstring, wrong-import-order,wrong-import-position,no-else-return +# pylint: disable=using-constant-test, no-init, missing-docstring, wrong-import-order,wrong-import-position,no-else-return, useless-object-inheritance from os import rename as nonseq_func from six import with_metaclass from functional.unpacking import nonseq diff --git a/pylint/test/functional/unsubscriptable_value.py b/pylint/test/functional/unsubscriptable_value.py index a125cb44c..eddb6211d 100644 --- a/pylint/test/functional/unsubscriptable_value.py +++ b/pylint/test/functional/unsubscriptable_value.py @@ -3,7 +3,7 @@ Checks that value used in a subscript supports subscription (i.e. defines __getitem__ method). """ # pylint: disable=missing-docstring,pointless-statement,expression-not-assigned,wrong-import-position -# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order +# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order, useless-object-inheritance import six # primitives @@ -112,4 +112,3 @@ class ClassMixin(object): def test_unsubscriptable(self): self.bala[0] self.portocala[0] -
\ No newline at end of file diff --git a/pylint/test/functional/unsupported_assignment_operation.py b/pylint/test/functional/unsupported_assignment_operation.py index 7aa9362bc..ad2deabef 100644 --- a/pylint/test/functional/unsupported_assignment_operation.py +++ b/pylint/test/functional/unsupported_assignment_operation.py @@ -3,7 +3,7 @@ Checks that value used in a subscript support assignments (i.e. defines __setitem__ method). """ # pylint: disable=missing-docstring,pointless-statement,expression-not-assigned,wrong-import-position -# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order +# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order, useless-object-inheritance import six # primitives diff --git a/pylint/test/functional/unsupported_binary_operation.py b/pylint/test/functional/unsupported_binary_operation.py index e4fb642ea..0bfe1d16a 100644 --- a/pylint/test/functional/unsupported_binary_operation.py +++ b/pylint/test/functional/unsupported_binary_operation.py @@ -1,6 +1,6 @@ """Test for unsupported-binary-operation."""
# pylint: disable=missing-docstring,too-few-public-methods,pointless-statement
-# pylint: disable=expression-not-assigned, invalid-name
+# pylint: disable=expression-not-assigned, invalid-name, useless-object-inheritance
import collections
diff --git a/pylint/test/functional/unsupported_delete_operation.py b/pylint/test/functional/unsupported_delete_operation.py index d91a64c59..c9bab62ea 100644 --- a/pylint/test/functional/unsupported_delete_operation.py +++ b/pylint/test/functional/unsupported_delete_operation.py @@ -3,7 +3,7 @@ Checks that value used in a subscript support deletion (i.e. defines __delitem__ method). """ # pylint: disable=missing-docstring,pointless-statement,expression-not-assigned,wrong-import-position -# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order +# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order, useless-object-inheritance import six # primitives diff --git a/pylint/test/functional/unused_argument.py b/pylint/test/functional/unused_argument.py index 30896315d..013d4b3e5 100644 --- a/pylint/test/functional/unused_argument.py +++ b/pylint/test/functional/unused_argument.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods +# pylint: disable=missing-docstring,too-few-public-methods, useless-object-inheritance def test_unused(first, second, _not_used): # [unused-argument, unused-argument] pass diff --git a/pylint/test/functional/unused_import.py b/pylint/test/functional/unused_import.py index a4d9ca2c6..3cd5ef2bf 100644 --- a/pylint/test/functional/unused_import.py +++ b/pylint/test/functional/unused_import.py @@ -1,5 +1,5 @@ """unused import""" -# pylint: disable=undefined-all-variable, import-error, no-absolute-import, too-few-public-methods, missing-docstring,wrong-import-position +# pylint: disable=undefined-all-variable, import-error, no-absolute-import, too-few-public-methods, missing-docstring,wrong-import-position, useless-object-inheritance import xml.etree # [unused-import] import xml.sax # [unused-import] import os.path as test # [unused-import] diff --git a/pylint/test/functional/unused_import_assigned_to.py b/pylint/test/functional/unused_import_assigned_to.py index 731287974..81d3e2ce0 100644 --- a/pylint/test/functional/unused_import_assigned_to.py +++ b/pylint/test/functional/unused_import_assigned_to.py @@ -1,5 +1,5 @@ # pylint: disable=missing-docstring, import-error, invalid-name -# pylint: disable=too-few-public-methods, blacklisted-name, no-member +# pylint: disable=too-few-public-methods, blacklisted-name, no-member, useless-object-inheritance import uuid diff --git a/pylint/test/functional/unused_variable.py b/pylint/test/functional/unused_variable.py index a4322d092..24d7b3ded 100644 --- a/pylint/test/functional/unused_variable.py +++ b/pylint/test/functional/unused_variable.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, invalid-name, too-few-public-methods, no-self-use +# pylint: disable=missing-docstring, invalid-name, too-few-public-methods, no-self-use, useless-object-inheritance def test_regression_737(): import xml # [unused-variable] diff --git a/pylint/test/functional/used_before_assignment_issue1081.py b/pylint/test/functional/used_before_assignment_issue1081.py index c2e0d88b5..0c59ccebe 100644 --- a/pylint/test/functional/used_before_assignment_issue1081.py +++ b/pylint/test/functional/used_before_assignment_issue1081.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,invalid-name,too-few-public-methods +# pylint: disable=missing-docstring,invalid-name,too-few-public-methods, useless-object-inheritance x = 24 diff --git a/pylint/test/functional/useless_object_inheritance.py b/pylint/test/functional/useless_object_inheritance.py index 0350f2feb..562c81f6a 100644 --- a/pylint/test/functional/useless_object_inheritance.py +++ b/pylint/test/functional/useless_object_inheritance.py @@ -19,3 +19,9 @@ class D(object, C, metaclass=abc.ABCMeta): # [useless-object-inheritance] class E(D, C, object, metaclass=abc.ABCMeta): # [useless-object-inheritance] pass + +class F(A): # positive test case + pass + +class G(B): # positive test case + pass diff --git a/pylint/test/functional/useless_return.py b/pylint/test/functional/useless_return.py index 8296dba25..55e8174a8 100644 --- a/pylint/test/functional/useless_return.py +++ b/pylint/test/functional/useless_return.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods,no-self-use,bad-option-value +# pylint: disable=missing-docstring,too-few-public-methods,no-self-use,bad-option-value, useless-object-inheritance from __future__ import print_function def myfunc(): # [useless-return] diff --git a/pylint/test/functional/useless_super_delegation.py b/pylint/test/functional/useless_super_delegation.py index 38c59e275..421f667e3 100644 --- a/pylint/test/functional/useless_super_delegation.py +++ b/pylint/test/functional/useless_super_delegation.py @@ -1,6 +1,6 @@ # pylint: disable=missing-docstring, no-member, no-self-use, bad-super-call # pylint: disable=too-few-public-methods, unused-argument, invalid-name, too-many-public-methods -# pylint: disable=line-too-long +# pylint: disable=line-too-long, useless-object-inheritance def not_a_method(param, param2): diff --git a/pylint/test/functional/useless_super_delegation_py3.py b/pylint/test/functional/useless_super_delegation_py3.py index e0691a7c0..1ab1f7ecd 100644 --- a/pylint/test/functional/useless_super_delegation_py3.py +++ b/pylint/test/functional/useless_super_delegation_py3.py @@ -1,5 +1,5 @@ # pylint: disable=missing-docstring, no-member, unused-argument, invalid-name,unused-variable -# pylint: disable=too-few-public-methods +# pylint: disable=too-few-public-methods, useless-object-inheritance class NotUselessSuper(object): diff --git a/pylint/test/functional/useless_super_delegation_py35.py b/pylint/test/functional/useless_super_delegation_py35.py index db451d571..ffc3c6c74 100644 --- a/pylint/test/functional/useless_super_delegation_py35.py +++ b/pylint/test/functional/useless_super_delegation_py35.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,too-few-public-methods,no-member,unused-argument +# pylint: disable=missing-docstring,too-few-public-methods,no-member,unused-argument, useless-object-inheritance class NotUselessSuper(object): diff --git a/pylint/test/functional/using_constant_test.py b/pylint/test/functional/using_constant_test.py index 2c0f58d54..fcd4a850f 100644 --- a/pylint/test/functional/using_constant_test.py +++ b/pylint/test/functional/using_constant_test.py @@ -1,6 +1,6 @@ """Verify if constant tests are used inside if statements."""
# pylint: disable=invalid-name, missing-docstring,too-few-public-methods
-# pylint: disable=no-init,expression-not-assigned
+# pylint: disable=no-init,expression-not-assigned, useless-object-inheritance
import collections
diff --git a/pylint/test/functional/with_using_generator.py b/pylint/test/functional/with_using_generator.py index 25c6b3776..187bdcfea 100644 --- a/pylint/test/functional/with_using_generator.py +++ b/pylint/test/functional/with_using_generator.py @@ -1,4 +1,5 @@ """ Testing with statements that use generators. This should not crash. """ +# pylint: disable=useless-object-inheritance class Base(object): """ Base class. """ diff --git a/pylint/test/functional/with_using_generator.txt b/pylint/test/functional/with_using_generator.txt index 276b05c2d..2b8103483 100644 --- a/pylint/test/functional/with_using_generator.txt +++ b/pylint/test/functional/with_using_generator.txt @@ -1 +1 @@ -not-context-manager:13:Base.fun:Context manager 'generator' doesn't implement __enter__ and __exit__. +not-context-manager:14:Base.fun:Context manager 'generator' doesn't implement __enter__ and __exit__. diff --git a/pylint/test/functional/wrong_import_position.py b/pylint/test/functional/wrong_import_position.py index cdc51d550..88db33be1 100644 --- a/pylint/test/functional/wrong_import_position.py +++ b/pylint/test/functional/wrong_import_position.py @@ -1,6 +1,6 @@ """Checks import order rule""" # pylint: disable=unused-import,relative-import,ungrouped-imports,wrong-import-order -# pylint: disable=import-error, too-few-public-methods, missing-docstring,using-constant-test +# pylint: disable=import-error, too-few-public-methods, missing-docstring,using-constant-test, useless-object-inheritance import os.path if True: diff --git a/pylint/test/input/func_block_disable_msg.py b/pylint/test/input/func_block_disable_msg.py index 5ed690ebf..36198db2b 100644 --- a/pylint/test/input/func_block_disable_msg.py +++ b/pylint/test/input/func_block_disable_msg.py @@ -1,4 +1,4 @@ -# pylint: disable=C0302,bare-except,print-statement +# pylint: disable=C0302,bare-except,print-statement, useless-object-inheritance """pylint option block-disable""" from __future__ import print_function diff --git a/pylint/test/input/func_bug113231.py b/pylint/test/input/func_bug113231.py index 70602e21a..a729f8898 100644 --- a/pylint/test/input/func_bug113231.py +++ b/pylint/test/input/func_bug113231.py @@ -1,6 +1,6 @@ # pylint: disable=E1101 # pylint: disable=C0103 -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """test bugfix for #113231 in logging checker """ from __future__ import absolute_import diff --git a/pylint/test/input/func_e0204.py b/pylint/test/input/func_e0204.py index 7ab9cff22..9a0f708f0 100644 --- a/pylint/test/input/func_e0204.py +++ b/pylint/test/input/func_e0204.py @@ -1,5 +1,6 @@ """check for method without self as first argument """ +# pylint: disable=useless-object-inheritance from __future__ import print_function __revision__ = 0 diff --git a/pylint/test/input/func_first_arg.py b/pylint/test/input/func_first_arg.py index 5180ca864..7df2fd20c 100644 --- a/pylint/test/input/func_first_arg.py +++ b/pylint/test/input/func_first_arg.py @@ -1,4 +1,4 @@ -# pylint: disable=C0111, W0232 +# pylint: disable=C0111, W0232, useless-object-inheritance """check for methods first arguments """ diff --git a/pylint/test/input/func_noerror___init___return_from_inner_function.py b/pylint/test/input/func_noerror___init___return_from_inner_function.py index 44f5fd0b7..769d5ac96 100644 --- a/pylint/test/input/func_noerror___init___return_from_inner_function.py +++ b/pylint/test/input/func_noerror___init___return_from_inner_function.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """#10075""" __revision__ = 1 diff --git a/pylint/test/input/func_noerror_access_attr_before_def_false_positive.py b/pylint/test/input/func_noerror_access_attr_before_def_false_positive.py index 7bc554b80..bb7eab2b5 100644 --- a/pylint/test/input/func_noerror_access_attr_before_def_false_positive.py +++ b/pylint/test/input/func_noerror_access_attr_before_def_false_positive.py @@ -1,4 +1,4 @@ -#pylint: disable=C0103,R0904,R0903,W0201,old-style-class,no-absolute-import +#pylint: disable=C0103,R0904,R0903,W0201,old-style-class,no-absolute-import, useless-object-inheritance """ This module demonstrates a possible problem of pyLint with calling __init__ s from inherited classes. diff --git a/pylint/test/input/func_noerror_base_init_vars.py b/pylint/test/input/func_noerror_base_init_vars.py index 3c25fc918..152cbfd47 100644 --- a/pylint/test/input/func_noerror_base_init_vars.py +++ b/pylint/test/input/func_noerror_base_init_vars.py @@ -1,4 +1,4 @@ -# pylint:disable=R0201, print-statement, too-few-public-methods +# pylint:disable=R0201, print-statement, too-few-public-methods, useless-object-inheritance """Checks that class variables are seen as inherited ! """ __revision__ = '' diff --git a/pylint/test/input/func_noerror_class_attributes.py b/pylint/test/input/func_noerror_class_attributes.py index 75fb435ec..b6fd4601e 100644 --- a/pylint/test/input/func_noerror_class_attributes.py +++ b/pylint/test/input/func_noerror_class_attributes.py @@ -1,5 +1,6 @@ """Test that valid class attribute doesn't trigger errors""" __revision__ = 'sponge bob' +# pylint: disable=useless-object-inheritance class Clazz(object): "dummy class" diff --git a/pylint/test/input/func_noerror_classes_meth_could_be_a_function.py b/pylint/test/input/func_noerror_classes_meth_could_be_a_function.py index e9e4cf079..05a6c40d7 100644 --- a/pylint/test/input/func_noerror_classes_meth_could_be_a_function.py +++ b/pylint/test/input/func_noerror_classes_meth_could_be_a_function.py @@ -1,4 +1,4 @@ -# pylint: disable=C0111,R0903,W0232 +# pylint: disable=C0111,R0903,W0232, useless-object-inheritance """ #2479 diff --git a/pylint/test/input/func_noerror_classes_protected_member_access.py b/pylint/test/input/func_noerror_classes_protected_member_access.py index 2ffd9d112..516efd7d4 100644 --- a/pylint/test/input/func_noerror_classes_protected_member_access.py +++ b/pylint/test/input/func_noerror_classes_protected_member_access.py @@ -3,7 +3,7 @@ """ __revision__ = 1 -# pylint: disable=no-classmethod-decorator, no-staticmethod-decorator +# pylint: disable=no-classmethod-decorator, no-staticmethod-decorator, useless-object-inheritance class A3123(object): """oypuee""" _protected = 1 diff --git a/pylint/test/input/func_noerror_decorator_scope.py b/pylint/test/input/func_noerror_decorator_scope.py index 81f929cd5..8d35159e9 100644 --- a/pylint/test/input/func_noerror_decorator_scope.py +++ b/pylint/test/input/func_noerror_decorator_scope.py @@ -1,4 +1,4 @@ -# -*- pylint: disable=W0232,R0903 +# -*- pylint: disable=W0232,R0903, useless-object-inheritance """Test that decorators sees the class namespace - just like function default values does but function body doesn't. diff --git a/pylint/test/input/func_noerror_e1101_9588_base_attr_aug_assign.py b/pylint/test/input/func_noerror_e1101_9588_base_attr_aug_assign.py index 5bd96250e..14be39853 100644 --- a/pylint/test/input/func_noerror_e1101_9588_base_attr_aug_assign.py +++ b/pylint/test/input/func_noerror_e1101_9588_base_attr_aug_assign.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """ False positive case of E1101: diff --git a/pylint/test/input/func_noerror_external_classmethod_crash.py b/pylint/test/input/func_noerror_external_classmethod_crash.py index 318f01c3e..e9842a5e5 100644 --- a/pylint/test/input/func_noerror_external_classmethod_crash.py +++ b/pylint/test/input/func_noerror_external_classmethod_crash.py @@ -1,4 +1,4 @@ -# pylint: disable=W0232,R0903,W0613 +# pylint: disable=W0232,R0903,W0613, useless-object-inheritance """tagging a function as a class method cause a crash when checking for signature overriding """ diff --git a/pylint/test/input/func_noerror_inner_classes.py b/pylint/test/input/func_noerror_inner_classes.py index 84fb43d8a..ce556d2dc 100644 --- a/pylint/test/input/func_noerror_inner_classes.py +++ b/pylint/test/input/func_noerror_inner_classes.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """Backend Base Classes for the schwelm user DB""" __revision__ = "alpha" diff --git a/pylint/test/input/func_noerror_mcs_attr_access.py b/pylint/test/input/func_noerror_mcs_attr_access.py index 7d9652eaa..149e07812 100644 --- a/pylint/test/input/func_noerror_mcs_attr_access.py +++ b/pylint/test/input/func_noerror_mcs_attr_access.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903, metaclass-assignment +# pylint: disable=R0903, metaclass-assignment, useless-object-inheritance """test attribute access on metaclass""" diff --git a/pylint/test/input/func_noerror_no_warning_docstring.py b/pylint/test/input/func_noerror_no_warning_docstring.py index 000f2683d..315eeeaab 100644 --- a/pylint/test/input/func_noerror_no_warning_docstring.py +++ b/pylint/test/input/func_noerror_no_warning_docstring.py @@ -1,7 +1,7 @@ ''' Test for inheritance ''' from __future__ import print_function __revision__ = 1 -# pylint: disable=too-few-public-methods, using-constant-test +# pylint: disable=too-few-public-methods, using-constant-test, useless-object-inheritance class AAAA(object): ''' class AAAA ''' diff --git a/pylint/test/input/func_noerror_object_as_class_attribute.py b/pylint/test/input/func_noerror_object_as_class_attribute.py index a134f1d88..71cd027b7 100644 --- a/pylint/test/input/func_noerror_object_as_class_attribute.py +++ b/pylint/test/input/func_noerror_object_as_class_attribute.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """Test case for the problem described below : - A class extends 'object' - This class defines its own __init__() diff --git a/pylint/test/input/func_noerror_overloaded_operator.py b/pylint/test/input/func_noerror_overloaded_operator.py index b6603ea60..3a158b00b 100644 --- a/pylint/test/input/func_noerror_overloaded_operator.py +++ b/pylint/test/input/func_noerror_overloaded_operator.py @@ -1,4 +1,4 @@ -# pylint: disable=C0111,R0903 +# pylint: disable=C0111,R0903, useless-object-inheritance """#3291""" from __future__ import print_function diff --git a/pylint/test/input/func_noerror_property_affectation_py26.py b/pylint/test/input/func_noerror_property_affectation_py26.py index d91f455dd..60118bbf6 100644 --- a/pylint/test/input/func_noerror_property_affectation_py26.py +++ b/pylint/test/input/func_noerror_property_affectation_py26.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903 +# pylint: disable=R0903, useless-object-inheritance """ Simple test case for an annoying behavior in pylint. """ diff --git a/pylint/test/input/func_typecheck_callfunc_assigment.py b/pylint/test/input/func_typecheck_callfunc_assigment.py index d980be3db..36d476e89 100644 --- a/pylint/test/input/func_typecheck_callfunc_assigment.py +++ b/pylint/test/input/func_typecheck_callfunc_assigment.py @@ -1,4 +1,4 @@ -# pylint: disable=useless-return +# pylint: disable=useless-return, useless-object-inheritance """check assignment to function call where the function doesn't return 'E1111': ('Assigning to function call which doesn\'t return', diff --git a/pylint/test/input/func_w0233.py b/pylint/test/input/func_w0233.py index efaaeae36..5a032d4c2 100644 --- a/pylint/test/input/func_w0233.py +++ b/pylint/test/input/func_w0233.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903,W0212,W0403,W0406,no-absolute-import,wrong-import-order +# pylint: disable=R0903,W0212,W0403,W0406,no-absolute-import,wrong-import-order, useless-object-inheritance """test for call to __init__ from a non ancestor class """ from __future__ import print_function diff --git a/pylint/test/input/func_w0611.py b/pylint/test/input/func_w0611.py index c129aba5c..887787242 100644 --- a/pylint/test/input/func_w0611.py +++ b/pylint/test/input/func_w0611.py @@ -1,6 +1,6 @@ """check unused import """ -# pylint: disable=no-absolute-import +# pylint: disable=no-absolute-import, useless-object-inheritance from __future__ import print_function diff --git a/pylint/test/input/func_w0613.py b/pylint/test/input/func_w0613.py index ea1ab29b3..02213c83b 100644 --- a/pylint/test/input/func_w0613.py +++ b/pylint/test/input/func_w0613.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903, print-statement +# pylint: disable=R0903, print-statement, useless-object-inheritance """test unused argument """ from __future__ import print_function diff --git a/pylint/test/messages/func_e0204.txt b/pylint/test/messages/func_e0204.txt index 8e05efea5..40a5928b5 100644 --- a/pylint/test/messages/func_e0204.txt +++ b/pylint/test/messages/func_e0204.txt @@ -1,3 +1,3 @@ -E: 10:Abcd.__init__: Method should have "self" as first argument -E: 14:Abcd.abdc: Method should have "self" as first argument +E: 11:Abcd.__init__: Method should have "self" as first argument +E: 15:Abcd.abdc: Method should have "self" as first argument diff --git a/pylint/test/regrtest_data/classdoc_usage.py b/pylint/test/regrtest_data/classdoc_usage.py index c17c9f6f9..2d9df51cd 100644 --- a/pylint/test/regrtest_data/classdoc_usage.py +++ b/pylint/test/regrtest_data/classdoc_usage.py @@ -1,6 +1,7 @@ """ds""" __revision__ = None +# pylint: disable=useless-object-inheritance class SomeClass(object): """cds""" diff --git a/pylint/test/regrtest_data/package/__init__.py b/pylint/test/regrtest_data/package/__init__.py index 7353ba870..26f4c3725 100644 --- a/pylint/test/regrtest_data/package/__init__.py +++ b/pylint/test/regrtest_data/package/__init__.py @@ -1,4 +1,4 @@ -# pylint: disable=R0903,W0403 +# pylint: disable=R0903,W0403,useless-object-inheritance """package's __init__ file""" from . import subpackage diff --git a/pylint/test/unittest_checker_classes.py b/pylint/test/unittest_checker_classes.py index 0c752b6c2..433b4da45 100644 --- a/pylint/test/unittest_checker_classes.py +++ b/pylint/test/unittest_checker_classes.py @@ -19,7 +19,7 @@ class TestVariablesChecker(CheckerTestCase): def test_bitbucket_issue_164(self): """Issue 164 report a false negative for access-member-before-definition""" n1, n2 = astroid.extract_node(""" - class MyClass1(object): + class MyClass1: def __init__(self): self.first += 5 #@ self.first = 0 #@ @@ -36,7 +36,7 @@ class TestVariablesChecker(CheckerTestCase): """ node = astroid.parse(""" - class Protected(object): + class Protected: '''empty''' def __init__(self): self._meta = 42 |