summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pylintrc4
-rw-r--r--tests/test_cmdline.py2
2 files changed, 1 insertions, 5 deletions
diff --git a/pylintrc b/pylintrc
index c295e4d0..717f67a2 100644
--- a/pylintrc
+++ b/pylintrc
@@ -84,10 +84,6 @@ disable=
# Formatting stuff
superfluous-parens,
bad-continuation,
-# Disable while we still support Python 2:
- useless-object-inheritance,
- super-with-arguments,
- raise-missing-from,
# Messages that are noisy for now, eventually maybe we'll turn them on:
invalid-name,
protected-access,
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 5299a7ad..a088ab8a 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -1047,7 +1047,7 @@ class CmdMainTest(CoverageTest):
try:
raise Exception("oh noes!")
except:
- raise _ExceptionDuringRun(*sys.exc_info())
+ raise _ExceptionDuringRun(*sys.exc_info()) from None
elif argv[0] == 'internalraise':
raise ValueError("coverage is broken")
elif argv[0] == 'exit':