Reorganize pylint config

This removes various stuff we don't need anymoe, and also re-enables and fixes
the import order check.

13 files changed, 25 insertions, 32 deletions

diff --git a/.pylintrc b/.pylintrc
index 177dbffd0..9ac07cafc 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -30,11 +30,7 @@ disable=no-self-use,
         broad-except,
         bare-except,
         eval-used,
-        exec-used,
-        file-ignored,
-        wrong-import-order,
         ungrouped-imports,
-        redefined-variable-type,
         suppressed-message,
         too-many-return-statements,
         duplicate-code,
@@ -53,12 +49,9 @@ no-docstring-rgx=(^_|^main$)
 
 [FORMAT]
 max-line-length=79
-ignore-long-lines=(<?https?://|^# Copyright 201\d|# (pylint|flake8): disable=)
+ignore-long-lines=(<?https?://|^# Copyright 201\d)
 expected-line-ending-format=LF
 
-[SIMILARITIES]
-min-similarity-lines=8
-
 [VARIABLES]
 dummy-variables-rgx=_.*
 
@@ -69,12 +62,7 @@ max-args=10
 valid-metaclass-classmethod-first-arg=cls
 
 [TYPECHECK]
-# WORKAROUND for https://github.com/PyCQA/astroid/pull/357
-ignored-modules=pytest,PyQt5,PyQt5.QtWebKit
-# MsgType added as WORKAROUND for
-# https://bitbucket.org/logilab/pylint/issues/690/
-# UnsetObject because pylint infers any objreg.get(...) as UnsetObject.
-ignored-classes=qutebrowser.utils.objreg.UnsetObject,
-                qutebrowser.browser.webkit.webelem.WebElementWrapper,
-                scripts.dev.check_coverage.MsgType,
-                qutebrowser.browser.downloads.UnsupportedAttribute
+ignored-modules=PyQt5,PyQt5.QtWebKit
+
+[IMPORTS]
+known-standard-library=faulthandler,http
diff --git a/qutebrowser/completion/models/sortfilter.py b/qutebrowser/completion/models/sortfilter.py
index 2bb454bf9..e2db88b9e 100644
--- a/qutebrowser/completion/models/sortfilter.py
+++ b/qutebrowser/completion/models/sortfilter.py
@@ -23,11 +23,12 @@ Contains:
     CompletionFilterModel -- A QSortFilterProxyModel subclass for completions.
 """
 
+import re
+
 from PyQt5.QtCore import QSortFilterProxyModel, QModelIndex, Qt
 
 from qutebrowser.utils import log, qtutils, debug
 from qutebrowser.completion.models import base as completion
-import re
 
 
 class CompletionFilterModel(QSortFilterProxyModel):
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 99fd3e1a3..1a0c361fc 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -35,12 +35,14 @@ import faulthandler
 import traceback
 import signal
 import importlib
-import pkg_resources
 import datetime
 try:
     import tkinter
 except ImportError:
     tkinter = None
+
+import pkg_resources
+
 # NOTE: No qutebrowser or PyQt import should be done here, as some early
 # initialization needs to take place before that!
 
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 066bc1576..3384856ef 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -20,9 +20,9 @@
 """Management of sessions - saved tabs/windows."""
 
 import os
-import sip
 import os.path
 
+import sip
 from PyQt5.QtCore import pyqtSignal, QUrl, QObject, QPoint, QTimer
 from PyQt5.QtWidgets import QApplication
 import yaml
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index 700ebe383..eba5b6884 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -39,7 +39,7 @@ except ImportError:
 check_python_version()
 from qutebrowser.utils import log
 
-import argparse
+import argparse  # pylint: disable=wrong-import-order
 from qutebrowser.misc import earlyinit
 
 
diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py
index 3b27eebb3..0a2c3d7b9 100644
--- a/tests/end2end/test_dirbrowser.py
+++ b/tests/end2end/test_dirbrowser.py
@@ -20,10 +20,10 @@
 """Test the built-in directory browser."""
 
 import os
-import bs4
 import collections
 
 import pytest
+import bs4
 
 from PyQt5.QtCore import QUrl
 from qutebrowser.utils import urlutils
diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index d155ffcc4..272fead29 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -21,12 +21,12 @@
 
 import os
 import os.path
+import textwrap
+import collections
 
 import yaml
 import pytest
 import bs4
-import textwrap
-import collections
 
 
 def collect_tests():
diff --git a/tests/unit/browser/webkit/network/test_webkitqutescheme.py b/tests/unit/browser/webkit/network/test_webkitqutescheme.py
index d45f1a31f..769ecc751 100644
--- a/tests/unit/browser/webkit/network/test_webkitqutescheme.py
+++ b/tests/unit/browser/webkit/network/test_webkitqutescheme.py
@@ -18,9 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-import pytest
 import logging
 
+import pytest
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import usertypes
diff --git a/tests/unit/keyinput/conftest.py b/tests/unit/keyinput/conftest.py
index 28c24b2e2..59bad5c61 100644
--- a/tests/unit/keyinput/conftest.py
+++ b/tests/unit/keyinput/conftest.py
@@ -19,9 +19,10 @@
 
 """pytest fixtures for tests.keyinput."""
 
+from unittest import mock
+
 import pytest
 
-from unittest import mock
 from qutebrowser.utils import objreg
 
 
diff --git a/tests/unit/misc/test_lineparser.py b/tests/unit/misc/test_lineparser.py
index 0d2b3a52e..b2dc90529 100644
--- a/tests/unit/misc/test_lineparser.py
+++ b/tests/unit/misc/test_lineparser.py
@@ -20,9 +20,10 @@
 """Tests for qutebrowser.misc.lineparser."""
 
 import os
-import pytest
 from unittest import mock
 
+import pytest
+
 from qutebrowser.misc import lineparser as lineparsermod
 
 
diff --git a/tests/unit/misc/test_utilcmds.py b/tests/unit/misc/test_utilcmds.py
index e4b686e31..aa0234c61 100644
--- a/tests/unit/misc/test_utilcmds.py
+++ b/tests/unit/misc/test_utilcmds.py
@@ -22,12 +22,12 @@
 import contextlib
 import logging
 import os
-import pytest
 import signal
 import time
 
-from qutebrowser.misc import utilcmds
+import pytest
 
+from qutebrowser.misc import utilcmds
 from qutebrowser.commands import cmdexc
 
 
diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
index 5d8798b96..dc22cb0d7 100644
--- a/tests/unit/utils/test_jinja.py
+++ b/tests/unit/utils/test_jinja.py
@@ -21,9 +21,9 @@
 
 import os
 import os.path
+import logging
 
 import pytest
-import logging
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import utils, jinja
diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index 45daa36d8..f7bf559a5 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -23,6 +23,8 @@ import io
 import os
 import sys
 import os.path
+import unittest
+import unittest.mock
 try:
     # pylint: disable=no-name-in-module,useless-suppression
     from test import test_file
@@ -31,8 +33,6 @@ except ImportError:
     test_file = None
 
 import pytest
-import unittest
-import unittest.mock
 from PyQt5.QtCore import (QDataStream, QPoint, QUrl, QByteArray, QIODevice,
                           QTimer, QBuffer, QFile, QProcess, QFileDevice)