pylint: Re-enable ungrouped-imports

19 files changed, 22 insertions, 24 deletions

diff --git a/.pylintrc b/.pylintrc
index f0429f322..a79f7797e 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -27,7 +27,6 @@ disable=locally-disabled,
         eval-used,
         exec-used,
         global-statement,
-        ungrouped-imports,
         wrong-import-position,
         duplicate-code,
         no-else-return,
diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index b7c93a994..5e2c60dfb 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -26,8 +26,8 @@ to a file on shutdown, so it makes sense to keep them as strings here.
 """
 
 import os
-import html
 import os.path
+import html
 import functools
 import collections
 
diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py
index 60ef2fbad..b8d63ad58 100644
--- a/qutebrowser/misc/crashsignal.py
+++ b/qutebrowser/misc/crashsignal.py
@@ -20,13 +20,13 @@
 """Handlers for crashes and OS signals."""
 
 import os
+import os.path
 import sys
 import bdb
 import pdb  # noqa: T002
 import signal
 import functools
 import faulthandler
-import os.path
 try:
     # WORKAROUND for segfaults when using pdb in pytest for some reason...
     import readline  # pylint: disable=unused-import
diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py
index 1efd47590..64f7eb9a8 100644
--- a/qutebrowser/utils/standarddir.py
+++ b/qutebrowser/utils/standarddir.py
@@ -20,9 +20,9 @@
 """Utilities to get and initialize data/config paths."""
 
 import os
+import os.path
 import sys
 import shutil
-import os.path
 import contextlib
 import enum
 
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index b277ccb77..f29db578e 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -20,12 +20,12 @@
 """Other utilities which don't fit anywhere else."""
 
 import os
+import os.path
 import io
 import re
 import sys
 import enum
 import json
-import os.path
 import collections
 import datetime
 import traceback
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index e12ff5c93..ce0ea2b8e 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -22,9 +22,9 @@
 
 
 import os
+import os.path
 import sys
 import glob
-import os.path
 import shutil
 import plistlib
 import subprocess
diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index 49055dad2..8ec4f80f7 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -21,9 +21,9 @@
 """Enforce perfect coverage on some files."""
 
 import os
+import os.path
 import sys
 import enum
-import os.path
 import subprocess
 from xml.etree import ElementTree
 
diff --git a/scripts/dev/get_coredumpctl_traces.py b/scripts/dev/get_coredumpctl_traces.py
index 711bc52c0..3935abdc8 100644
--- a/scripts/dev/get_coredumpctl_traces.py
+++ b/scripts/dev/get_coredumpctl_traces.py
@@ -21,10 +21,10 @@
 """Get qutebrowser crash information and stacktraces from coredumpctl."""
 
 import os
+import os.path
 import sys
 import argparse
 import subprocess
-import os.path
 import tempfile
 
 import attr
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index e1517391d..c04a35f1a 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -21,9 +21,9 @@
 """Various small code checkers."""
 
 import os
+import os.path
 import re
 import sys
-import os.path
 import argparse
 import subprocess
 import tokenize
diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index 1f99aa362..198d1e0e6 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -25,8 +25,8 @@ https://bitbucket.org/logilab/pylint/issue/512/
 """
 
 import os
-import sys
 import os.path
+import sys
 import subprocess
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
diff --git a/scripts/dev/segfault_test.py b/scripts/dev/segfault_test.py
index 642bb837d..efd60c232 100755
--- a/scripts/dev/segfault_test.py
+++ b/scripts/dev/segfault_test.py
@@ -21,10 +21,10 @@
 """Tester for Qt segfaults with different harfbuzz engines."""
 
 import os
+import os.path
 import signal
 import sys
 import subprocess
-import os.path
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
                                 os.pardir))
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 6f4352d77..803280deb 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -21,9 +21,9 @@
 """Generate asciidoc source for qutebrowser based on docstrings."""
 
 import os
+import os.path
 import sys
 import shutil
-import os.path
 import inspect
 import subprocess
 import tempfile
@@ -34,11 +34,11 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
 
 # We import qutebrowser.app so all @cmdutils-register decorators are run.
 import qutebrowser.app
-from scripts import asciidoc2html, utils
 from qutebrowser import qutebrowser, commands
 from qutebrowser.commands import cmdutils, argparser
 from qutebrowser.config import configdata, configtypes
 from qutebrowser.utils import docutils, usertypes
+from scripts import asciidoc2html, utils
 
 FILE_HEADER = """
 // DO NOT EDIT THIS FILE DIRECTLY!
diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index ad7d45383..02f979137 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -21,9 +21,9 @@
 """Symlink PyQt into a given virtualenv."""
 
 import os
+import os.path
 import argparse
 import shutil
-import os.path
 import sys
 import subprocess
 import tempfile
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 309793ddc..084f5439d 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -23,10 +23,10 @@
 
 import re
 import os
+import os.path
 import sys
 import shutil
 import pstats
-import os.path
 import operator
 
 import pytest
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 05e609fda..3f5e727e6 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -20,10 +20,10 @@
 """Fixtures to run qutebrowser in a QProcess and communicate."""
 
 import os
+import os.path
 import re
 import sys
 import time
-import os.path
 import datetime
 import logging
 import tempfile
diff --git a/tests/end2end/test_mhtml_e2e.py b/tests/end2end/test_mhtml_e2e.py
index 4317271f5..012c2ea2a 100644
--- a/tests/end2end/test_mhtml_e2e.py
+++ b/tests/end2end/test_mhtml_e2e.py
@@ -20,8 +20,8 @@
 """Test mhtml downloads based on sample files."""
 
 import os
-import re
 import os.path
+import re
 import collections
 
 import pytest
diff --git a/tests/unit/javascript/conftest.py b/tests/unit/javascript/conftest.py
index 8490a5362..c5c384c26 100644
--- a/tests/unit/javascript/conftest.py
+++ b/tests/unit/javascript/conftest.py
@@ -27,11 +27,6 @@ import pytest
 import jinja2
 
 from PyQt5.QtCore import QUrl
-
-import helpers.utils
-import qutebrowser.utils.debug
-from qutebrowser.utils import utils
-
 try:
     from PyQt5.QtWebKit import QWebSettings
     from PyQt5.QtWebKitWidgets import QWebPage
@@ -49,6 +44,10 @@ except ImportError:
     QWebEngineSettings = None
     QWebEngineScript = None
 
+import helpers.utils
+import qutebrowser.utils.debug
+from qutebrowser.utils import utils
+
 
 if QWebPage is None:
     TestWebPage = None
diff --git a/tests/unit/scripts/test_dictcli.py b/tests/unit/scripts/test_dictcli.py
index e5408ef68..3471251ba 100644
--- a/tests/unit/scripts/test_dictcli.py
+++ b/tests/unit/scripts/test_dictcli.py
@@ -22,8 +22,8 @@ import py.path  # pylint: disable=no-name-in-module
 import pytest
 
 from qutebrowser.browser.webengine import spell
-from scripts import dictcli
 from qutebrowser.config import configdata
+from scripts import dictcli
 
 
 def afrikaans():
diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index 5a3f74a66..e13b5e917 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -20,9 +20,9 @@
 """Tests for qutebrowser.utils.standarddir."""
 
 import os
+import os.path
 import sys
 import json
-import os.path
 import types
 import textwrap
 import logging