Merge pull request #85 from carsongee/feature/cleanup

Pylint cleanup
carsongee · Jan 15, 2019 · 9bfe8be · 9bfe8be
2 parents a319ad4 + 2163a8f
commit 9bfe8be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/pylintrc b/pylintrc
@@ -1,3 +1,8 @@
 [TYPECHECK]
-ignored-classes=pytest
-disable=bad-option-value
+
+ignored-classes = pytest
+
+
+[MESSAGES CONTROL]
+
+disable = useless-object-inheritance
diff --git a/pytest_pylint.py b/pytest_pylint.py
@@ -166,16 +166,12 @@ def pytest_configure(config):
     config.addinivalue_line('markers', "pylint: Tests which run pylint.")
 
 
-# There will be an old-style-class error in Python 2.7,
-# or a useless-object-inheritance warning in Python 3.
-# If disable any, pylint will have a bad-option-value error in 2.7 or 3.
-# Finally I have to disable useless-object-inheritance locally
-# and bad-option-value globally.
-# pylint: disable=too-few-public-methods, useless-object-inheritance
 class PylintPlugin(object):
     """
     A Plugin object for pylint, which loads and records file mtimes.
     """
+    # pylint: disable=too-few-public-methods
+
     def __init__(self, config):
         self.mtimes = config.cache.get(HISTKEY, {})