From 05fc98c64a2cf7368f19f946c4d5cea572fdabfe Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Wed, 3 Apr 2019 21:19:12 +0200
Subject: [PATCH 1/6] Run isort over all files

---
 picard/acoustid/__init__.py        | 4 +---
 picard/config.py                   | 4 +---
 picard/coverart/__init__.py        | 1 -
 picard/formats/apev2.py            | 1 -
 picard/formats/vorbis.py           | 1 -
 picard/tagger.py                   | 8 ++++----
 picard/ui/itemviews.py             | 5 ++++-
 picard/ui/mainwindow.py            | 4 +---
 picard/ui/options/cover.py         | 4 +---
 picard/ui/options/plugins.py       | 1 -
 picard/ui/options/releases.py      | 1 -
 picard/ui/options/renaming.py      | 2 --
 picard/ui/searchdialog/__init__.py | 4 +---
 picard/ui/util.py                  | 4 +---
 picard/util/__init__.py            | 1 -
 picard/util/bytes2human.py         | 1 -
 picard/util/icontheme.py           | 1 -
 test/formats/common.py             | 1 -
 test/formats/coverart.py           | 1 +
 test/formats/test_apev2.py         | 4 ++--
 test/formats/test_asf.py           | 1 +
 test/formats/test_id3.py           | 1 +
 test/formats/test_mp4.py           | 1 +
 test/formats/test_vorbis.py        | 4 ++--
 test/test_config.py                | 2 +-
 test/test_coverart_image.py        | 4 ++--
 test/test_file.py                  | 1 -
 test/test_filesystem.py            | 1 -
 test/test_metadata.py              | 1 -
 test/test_scripttofilename.py      | 1 -
 test/test_util_filenaming.py       | 1 +
 31 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/picard/acoustid/__init__.py b/picard/acoustid/__init__.py
index fb6e4d3d3..376b4dac1 100644
--- a/picard/acoustid/__init__.py
+++ b/picard/acoustid/__init__.py
@@ -29,9 +29,7 @@ from picard import (
 from picard.acoustid.json_helpers import parse_recording
 from picard.const import FPCALC_NAMES
 from picard.const.sys import IS_FROZEN
-from picard.util import (
-    find_executable,
-)
+from picard.util import find_executable
 
 
 class AcoustIDClient(QtCore.QObject):
diff --git a/picard/config.py b/picard/config.py
index 8a6b49c37..f55da1279 100644
--- a/picard/config.py
+++ b/picard/config.py
@@ -29,9 +29,7 @@ from picard import (
     version_from_string,
     version_to_string,
 )
-from picard.util import (
-    LockableObject,
-)
+from picard.util import LockableObject
 
 
 class ConfigUpgradeError(Exception):
diff --git a/picard/coverart/__init__.py b/picard/coverart/__init__.py
index 54d050729..792bc9cbc 100644
--- a/picard/coverart/__init__.py
+++ b/picard/coverart/__init__.py
@@ -40,7 +40,6 @@ from picard.coverart.providers import (
     CoverArtProvider,
     cover_art_providers,
 )
-
 from picard.metadata import register_album_metadata_processor
 
 
diff --git a/picard/formats/apev2.py b/picard/formats/apev2.py
index 5c8db4c17..3375e3e87 100644
--- a/picard/formats/apev2.py
+++ b/picard/formats/apev2.py
@@ -45,7 +45,6 @@ from picard.util import (
 
 from .mutagenext import tak
 
-
 INVALID_CHARS = re.compile('[^\x20-\x7e]')
 BLACKLISTED_KEYS = ['ID3', 'TAG', 'OggS', 'MP+']
 UNSUPPORTED_TAGS = [
diff --git a/picard/formats/vorbis.py b/picard/formats/vorbis.py
index be37ee9ac..d4c1bcf81 100644
--- a/picard/formats/vorbis.py
+++ b/picard/formats/vorbis.py
@@ -48,7 +48,6 @@ from picard.util import (
     sanitize_date,
 )
 
-
 INVALID_CHARS = re.compile('([^\x20-\x7d]|=)')
 
 
diff --git a/picard/tagger.py b/picard/tagger.py
index b2ef2ed64..a3133ab9e 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -58,15 +58,15 @@ from picard.cluster import (
 )
 from picard.collection import load_user_collections
 from picard.config_upgrade import upgrade_config
+from picard.const import (
+    USER_DIR,
+    USER_PLUGIN_DIR,
+)
 from picard.const.sys import (
     IS_FROZEN,
     IS_MACOS,
     IS_WIN,
 )
-from picard.const import (
-    USER_DIR,
-    USER_PLUGIN_DIR,
-)
 from picard.dataobj import DataObject
 from picard.disc import Disc
 from picard.file import File
diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
index ea3cec75e..4e0c5c686 100644
--- a/picard/ui/itemviews.py
+++ b/picard/ui/itemviews.py
@@ -18,7 +18,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 from functools import partial
-from heapq import heappush, heappop
+from heapq import (
+    heappop,
+    heappush,
+)
 import os
 import re
 
diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index 58de4dfe2..eb8649836 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -35,9 +35,7 @@ from picard import (
 from picard.album import Album
 from picard.cluster import Cluster
 from picard.const import PROGRAM_UPDATE_LEVELS
-from picard.const.sys import (
-    IS_MACOS,
-)
+from picard.const.sys import IS_MACOS
 from picard.file import File
 from picard.formats import supported_formats
 from picard.plugin import ExtensionPoint
diff --git a/picard/ui/options/cover.py b/picard/ui/options/cover.py
index 25a93e389..7606fe837 100644
--- a/picard/ui/options/cover.py
+++ b/picard/ui/options/cover.py
@@ -18,9 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 from picard import config
-from picard.coverart.providers import (
-    cover_art_providers,
-)
+from picard.coverart.providers import cover_art_providers
 
 from picard.ui.checkbox_list_item import CheckboxListItem
 from picard.ui.moveable_list_view import MoveableListView
diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index a3d04f16e..3e02f39a6 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -35,7 +35,6 @@ from picard import (
     config,
     log,
 )
-
 from picard.const import (
     PLUGINS_API,
     USER_PLUGIN_DIR,
diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
index 7170dd015..bb7f8a971 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -26,7 +26,6 @@ from PyQt5 import (
 )
 
 from picard import config
-
 from picard.const import (
     RELEASE_COUNTRIES,
     RELEASE_FORMATS,
diff --git a/picard/ui/options/renaming.py b/picard/ui/options/renaming.py
index fed4d9e91..71c59d99e 100644
--- a/picard/ui/options/renaming.py
+++ b/picard/ui/options/renaming.py
@@ -47,8 +47,6 @@ from picard.ui.options.scripting import TaggerScriptSyntaxHighlighter
 from picard.ui.ui_options_renaming import Ui_RenamingOptionsPage
 from picard.ui.util import enabledSlot
 
-
-
 _default_music_dir = QStandardPaths.writableLocation(QStandardPaths.MusicLocation)
 
 
diff --git a/picard/ui/searchdialog/__init__.py b/picard/ui/searchdialog/__init__.py
index b9ed4d1a5..20321fdfa 100644
--- a/picard/ui/searchdialog/__init__.py
+++ b/picard/ui/searchdialog/__init__.py
@@ -42,9 +42,7 @@ from picard.util import (
 )
 
 from picard.ui import PicardDialog
-from picard.ui.util import (
-    StandardButton,
-)
+from picard.ui.util import StandardButton
 
 
 class ResultTable(QtWidgets.QTableWidget):
diff --git a/picard/ui/util.py b/picard/ui/util.py
index aa7abca55..d972489bc 100644
--- a/picard/ui/util.py
+++ b/picard/ui/util.py
@@ -27,9 +27,7 @@ from picard.const.sys import (
     IS_MACOS,
     IS_WIN,
 )
-from picard.util import (
-    find_existing_path,
-)
+from picard.util import find_existing_path
 
 
 class StandardButton(QtWidgets.QPushButton):
diff --git a/picard/util/__init__.py b/picard/util/__init__.py
index 3de4200fd..631208f5c 100644
--- a/picard/util/__init__.py
+++ b/picard/util/__init__.py
@@ -39,7 +39,6 @@ from picard.const.sys import (
     IS_WIN,
 )
 
-
 if IS_WIN:
     from ctypes import windll
 
diff --git a/picard/util/bytes2human.py b/picard/util/bytes2human.py
index 73209e970..a5073f5a3 100644
--- a/picard/util/bytes2human.py
+++ b/picard/util/bytes2human.py
@@ -28,7 +28,6 @@ It supports i18n through gettext, decimal and binary units.
 
 import locale
 
-
 # used to force gettextization
 _BYTES_STRINGS_I18N = (
     N_('%s B'),
diff --git a/picard/util/icontheme.py b/picard/util/icontheme.py
index ffcb91105..d57a5ec07 100644
--- a/picard/util/icontheme.py
+++ b/picard/util/icontheme.py
@@ -23,7 +23,6 @@ from PyQt5 import QtGui
 
 from picard.const.sys import IS_WIN
 
-
 if IS_WIN:
     _search_paths = []
 else:
diff --git a/test/formats/common.py b/test/formats/common.py
index 52aa93bf5..406960bdb 100644
--- a/test/formats/common.py
+++ b/test/formats/common.py
@@ -12,7 +12,6 @@ import picard.formats
 from picard.formats import ext_to_format
 from picard.metadata import Metadata
 
-
 settings = {
     'clear_existing_tags': False,
     'embed_only_one_front_image': False,
diff --git a/test/formats/coverart.py b/test/formats/coverart.py
index bfe37e9d3..57adad1a4 100644
--- a/test/formats/coverart.py
+++ b/test/formats/coverart.py
@@ -7,6 +7,7 @@ from picard.coverart.image import (
 )
 import picard.formats
 from picard.metadata import Metadata
+
 from .common import (
     CommonTests,
     skipUnlessTestfile,
diff --git a/test/formats/test_apev2.py b/test/formats/test_apev2.py
index 22beb61e8..e847766da 100644
--- a/test/formats/test_apev2.py
+++ b/test/formats/test_apev2.py
@@ -1,14 +1,14 @@
 from test.picardtestcase import PicardTestCase
 
 from picard.formats import apev2
+
 from .common import (
+    TAGS,
     CommonTests,
     load_metadata,
-    TAGS,
 )
 from .coverart import CommonCoverArtTests
 
-
 VALID_KEYS = [
     ' valid Key}',
     '{ $ome tag~}',
diff --git a/test/formats/test_asf.py b/test/formats/test_asf.py
index c08a41daa..93ae2cdc6 100644
--- a/test/formats/test_asf.py
+++ b/test/formats/test_asf.py
@@ -4,6 +4,7 @@ from test.picardtestcase import (
 )
 
 from picard.formats import asf
+
 from .common import CommonTests
 from .coverart import CommonCoverArtTests
 
diff --git a/test/formats/test_id3.py b/test/formats/test_id3.py
index d85d430a7..3e71a9846 100644
--- a/test/formats/test_id3.py
+++ b/test/formats/test_id3.py
@@ -4,6 +4,7 @@ from test.picardtestcase import PicardTestCase
 from picard import config
 from picard.formats import id3
 from picard.metadata import Metadata
+
 from .common import (
     CommonTests,
     load_metadata,
diff --git a/test/formats/test_mp4.py b/test/formats/test_mp4.py
index 8d3dbfdc1..eaeaf5915 100644
--- a/test/formats/test_mp4.py
+++ b/test/formats/test_mp4.py
@@ -1,4 +1,5 @@
 from picard.formats import ext_to_format
+
 from .common import (
     CommonTests,
     load_metadata,
diff --git a/test/formats/test_vorbis.py b/test/formats/test_vorbis.py
index f06003fbe..9fc679ea9 100644
--- a/test/formats/test_vorbis.py
+++ b/test/formats/test_vorbis.py
@@ -8,20 +8,20 @@ from picard import (
 )
 from picard.coverart.image import CoverArtImage
 from picard.formats import vorbis
+
 from .common import (
+    TAGS,
     CommonTests,
     load_metadata,
     load_raw,
     save_and_load_metadata,
     skipUnlessTestfile,
-    TAGS,
 )
 from .coverart import (
     CommonCoverArtTests,
     file_save_image,
 )
 
-
 VALID_KEYS = [
     ' valid Key}',
     '{ $ome tag}',
diff --git a/test/test_config.py b/test/test_config.py
index 91177daf8..d30a9f527 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -21,7 +21,6 @@ import logging
 import os
 import shutil
 from tempfile import mkdtemp
-
 from test.picardtestcase import PicardTestCase
 
 from picard.config import (
@@ -34,6 +33,7 @@ from picard.config import (
     TextOption,
 )
 
+
 class TestPicardConfigCommon(PicardTestCase):
 
     def setUp(self):
diff --git a/test/test_coverart_image.py b/test/test_coverart_image.py
index 1dfac014e..ff8c42e79 100644
--- a/test/test_coverart_image.py
+++ b/test/test_coverart_image.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # coding: utf-8
 import os.path
-import unittest
-
 from test.picardtestcase import (
     PicardTestCase,
     create_fake_png,
 )
+import unittest
+
 from picard.const.sys import IS_WIN
 from picard.coverart.image import (
     CoverArtImage,
diff --git a/test/test_file.py b/test/test_file.py
index 9dbf1d327..d60ed0ee2 100644
--- a/test/test_file.py
+++ b/test/test_file.py
@@ -1,7 +1,6 @@
 import os
 import shutil
 from tempfile import mkdtemp
-
 from test.picardtestcase import PicardTestCase
 
 from picard.file import File
diff --git a/test/test_filesystem.py b/test/test_filesystem.py
index ae45848c7..a67361116 100644
--- a/test/test_filesystem.py
+++ b/test/test_filesystem.py
@@ -8,7 +8,6 @@ from test.picardtestcase import PicardTestCase
 from picard import config
 import picard.formats
 
-
 settings = {
     'enabled_plugins': '',
     'move_files': True,
diff --git a/test/test_metadata.py b/test/test_metadata.py
index 4d91ebf38..b05268a5c 100644
--- a/test/test_metadata.py
+++ b/test/test_metadata.py
@@ -9,7 +9,6 @@ from picard.metadata import (
 )
 from picard.util.tags import PRESERVED_TAGS
 
-
 settings = {
     'write_id3v23': False,
     'id3v23_join_with': '/',
diff --git a/test/test_scripttofilename.py b/test/test_scripttofilename.py
index ab2e4ba6a..b219271df 100644
--- a/test/test_scripttofilename.py
+++ b/test/test_scripttofilename.py
@@ -7,7 +7,6 @@ from picard.metadata import Metadata
 from picard.script import register_script_function
 from picard.util.scripttofilename import script_to_filename
 
-
 settings = {
     'ascii_filenames': False,
     'enabled_plugins': [],
diff --git a/test/test_util_filenaming.py b/test/test_util_filenaming.py
index 5dcb7fd68..a143d0557 100644
--- a/test/test_util_filenaming.py
+++ b/test/test_util_filenaming.py
@@ -12,6 +12,7 @@ from picard.const.sys import (
 )
 from picard.util.filenaming import make_short_filename
 
+
 class ShortFilenameTest(PicardTestCase):
 
     def __init__(self, *args, **kwargs):

From dd4da2aa474892ca858163cb8ebc57a14fdc13ce Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Thu, 4 Apr 2019 08:32:04 +0200
Subject: [PATCH 2/6] Updated isort config to put test imports in separate
 section

---
 .isort.cfg                   | 3 ++-
 test/formats/common.py       | 3 ++-
 test/formats/test_id3.py     | 1 +
 test/formats/test_vorbis.py  | 1 +
 test/test_acoustid.py        | 1 +
 test/test_api_helpers.py     | 3 ++-
 test/test_browser.py         | 3 ++-
 test/test_bytes2human.py     | 1 +
 test/test_compatid3.py       | 4 ++--
 test/test_config.py          | 1 +
 test/test_coverart_image.py  | 3 ++-
 test/test_coverart_utils.py  | 1 +
 test/test_file.py            | 1 +
 test/test_filesystem.py      | 1 +
 test/test_mbjson.py          | 1 +
 test/test_releaseversions.py | 1 +
 test/test_script.py          | 3 ++-
 test/test_util_astrcmp.py    | 3 ++-
 test/test_util_filenaming.py | 3 ++-
 test/test_utils.py           | 3 ++-
 test/test_webservice.py      | 3 ++-
 21 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/.isort.cfg b/.isort.cfg
index 2fee656bb..3fa2b751d 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -16,9 +16,10 @@ known_picard=picard
 known_picard_ui=picard.ui
 known_qt=PyQt5
 known_resources=picard.resources
+known_test=test.*
 multi_line_output=3
 order_by_type=True
-sections=FUTURE,STDLIB,THIRDPARTY,QT,PICARD,LOCALFOLDER,RESOURCES,PICARD_UI
+sections=FUTURE,STDLIB,THIRDPARTY,QT,TEST,PICARD,LOCALFOLDER,RESOURCES,PICARD_UI
 skip_glob=**/picard/ui/ui_*.py
 skip=./tagger.py,picard/const/attributes.py,picard/const/countries.py,picard/resources.py,scripts/picard.in,picard/const/__init__.py,picard/formats/__init__.py,picard/coverart/providers/__init__.py
 not_skip=__init__.py
diff --git a/test/formats/common.py b/test/formats/common.py
index 406960bdb..2d58cfc93 100644
--- a/test/formats/common.py
+++ b/test/formats/common.py
@@ -2,11 +2,12 @@
 import os.path
 import shutil
 from tempfile import mkstemp
-from test.picardtestcase import PicardTestCase
 import unittest
 
 import mutagen
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 import picard.formats
 from picard.formats import ext_to_format
diff --git a/test/formats/test_id3.py b/test/formats/test_id3.py
index 3e71a9846..c07b260e7 100644
--- a/test/formats/test_id3.py
+++ b/test/formats/test_id3.py
@@ -1,4 +1,5 @@
 import os.path
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/formats/test_vorbis.py b/test/formats/test_vorbis.py
index 9fc679ea9..143fe61d4 100644
--- a/test/formats/test_vorbis.py
+++ b/test/formats/test_vorbis.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 from test.picardtestcase import PicardTestCase
 
 from picard import (
diff --git a/test/test_acoustid.py b/test/test_acoustid.py
index 7fc504deb..6ca725a19 100644
--- a/test/test_acoustid.py
+++ b/test/test_acoustid.py
@@ -1,5 +1,6 @@
 import json
 import os
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_api_helpers.py b/test/test_api_helpers.py
index e309c601e..c4a65b23f 100644
--- a/test/test_api_helpers.py
+++ b/test/test_api_helpers.py
@@ -1,6 +1,7 @@
-from test.picardtestcase import PicardTestCase
 from unittest.mock import MagicMock
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 from picard.webservice import WebService
 from picard.webservice.api_helpers import (
diff --git a/test/test_browser.py b/test/test_browser.py
index f14781353..8cf5a49b9 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -1,10 +1,11 @@
-from test.picardtestcase import PicardTestCase
 from unittest.mock import patch
 from urllib.parse import (
     parse_qs,
     urlparse,
 )
 
+from test.picardtestcase import PicardTestCase
+
 from picard.browser.filelookup import FileLookup
 from picard.util import webbrowser2
 
diff --git a/test/test_bytes2human.py b/test/test_bytes2human.py
index 7700a6377..bacc12705 100644
--- a/test/test_bytes2human.py
+++ b/test/test_bytes2human.py
@@ -2,6 +2,7 @@ import os.path
 import shutil
 import sys
 import tempfile
+
 from test.picardtestcase import PicardTestCase
 
 from picard.i18n import setup_gettext
diff --git a/test/test_compatid3.py b/test/test_compatid3.py
index 94ed87e24..72fd1c35d 100644
--- a/test/test_compatid3.py
+++ b/test/test_compatid3.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from test.picardtestcase import PicardTestCase
-
 from mutagen import id3
 
+from test.picardtestcase import PicardTestCase
+
 from picard.formats.id3 import id3text
 from picard.formats.mutagenext import compatid3
 
diff --git a/test/test_config.py b/test/test_config.py
index d30a9f527..980f351c7 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -21,6 +21,7 @@ import logging
 import os
 import shutil
 from tempfile import mkdtemp
+
 from test.picardtestcase import PicardTestCase
 
 from picard.config import (
diff --git a/test/test_coverart_image.py b/test/test_coverart_image.py
index ff8c42e79..cab7762b6 100644
--- a/test/test_coverart_image.py
+++ b/test/test_coverart_image.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # coding: utf-8
 import os.path
+import unittest
+
 from test.picardtestcase import (
     PicardTestCase,
     create_fake_png,
 )
-import unittest
 
 from picard.const.sys import IS_WIN
 from picard.coverart.image import (
diff --git a/test/test_coverart_utils.py b/test/test_coverart_utils.py
index 0380ad9dd..fb59b32b3 100644
--- a/test/test_coverart_utils.py
+++ b/test/test_coverart_utils.py
@@ -3,6 +3,7 @@
 import os.path
 import shutil
 import tempfile
+
 from test.picardtestcase import PicardTestCase
 
 from picard.coverart.utils import translate_caa_type
diff --git a/test/test_file.py b/test/test_file.py
index d60ed0ee2..9dbf1d327 100644
--- a/test/test_file.py
+++ b/test/test_file.py
@@ -1,6 +1,7 @@
 import os
 import shutil
 from tempfile import mkdtemp
+
 from test.picardtestcase import PicardTestCase
 
 from picard.file import File
diff --git a/test/test_filesystem.py b/test/test_filesystem.py
index a67361116..b6005ff59 100644
--- a/test/test_filesystem.py
+++ b/test/test_filesystem.py
@@ -3,6 +3,7 @@ from contextlib import suppress
 import os.path
 import shutil
 from tempfile import mkdtemp
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_mbjson.py b/test/test_mbjson.py
index 5f4f761b1..d76b5d316 100644
--- a/test/test_mbjson.py
+++ b/test/test_mbjson.py
@@ -1,5 +1,6 @@
 import json
 import os
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_releaseversions.py b/test/test_releaseversions.py
index b07cdfebc..3baa7a2a6 100644
--- a/test/test_releaseversions.py
+++ b/test/test_releaseversions.py
@@ -3,6 +3,7 @@ import os.path
 import shutil
 import sys
 import tempfile
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_script.py b/test/test_script.py
index 05b034a84..d3eddd5d8 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -1,6 +1,7 @@
-from test.picardtestcase import PicardTestCase
 from unittest.mock import MagicMock
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 from picard.const import DEFAULT_FILE_NAMING_FORMAT
 from picard.metadata import Metadata
diff --git a/test/test_util_astrcmp.py b/test/test_util_astrcmp.py
index 8488c1099..f94a98706 100644
--- a/test/test_util_astrcmp.py
+++ b/test/test_util_astrcmp.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-from test.picardtestcase import PicardTestCase
 import unittest
 
+from test.picardtestcase import PicardTestCase
+
 from picard.util.astrcmp import astrcmp_py
 
 try:
diff --git a/test/test_util_filenaming.py b/test/test_util_filenaming.py
index a143d0557..bdb7a0838 100644
--- a/test/test_util_filenaming.py
+++ b/test/test_util_filenaming.py
@@ -3,9 +3,10 @@
 import os
 import os.path
 import sys
-from test.picardtestcase import PicardTestCase
 import unittest
 
+from test.picardtestcase import PicardTestCase
+
 from picard.const.sys import (
     IS_MACOS,
     IS_WIN,
diff --git a/test/test_utils.py b/test/test_utils.py
index b3b8b1faf..464fd53a2 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -3,9 +3,10 @@
 import builtins
 from collections import namedtuple
 import os.path
-from test.picardtestcase import PicardTestCase
 import unittest
 
+from test.picardtestcase import PicardTestCase
+
 from picard import util
 from picard.const.sys import IS_WIN
 from picard.util import (
diff --git a/test/test_webservice.py b/test/test_webservice.py
index 26ae49297..313b513da 100644
--- a/test/test_webservice.py
+++ b/test/test_webservice.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from test.picardtestcase import PicardTestCase
 from unittest.mock import (
     MagicMock,
     patch,
 )
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 from picard.webservice import (
     UnknownResponseParserError,

From dc0ec84401150d54a121ff69bd6d21de035d2e54 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Thu, 4 Apr 2019 08:35:23 +0200
Subject: [PATCH 3/6] isort: Consistently use two blank lines after import

---
 .isort.cfg                             | 1 +
 picard/__init__.py                     | 1 +
 picard/collection.py                   | 1 +
 picard/config_upgrade.py               | 1 +
 picard/const/sys.py                    | 1 +
 picard/coverart/image.py               | 1 +
 picard/coverart/providers/caa.py       | 1 +
 picard/coverart/utils.py               | 1 +
 picard/formats/apev2.py                | 1 +
 picard/formats/id3.py                  | 1 +
 picard/formats/mutagenext/compatid3.py | 1 +
 picard/formats/vorbis.py               | 1 +
 picard/i18n.py                         | 1 +
 picard/log.py                          | 1 +
 picard/mbjson.py                       | 1 +
 picard/metadata.py                     | 1 +
 picard/plugin.py                       | 1 +
 picard/track.py                        | 1 +
 picard/ui/filebrowser.py               | 1 +
 picard/ui/mainwindow.py                | 1 +
 picard/ui/metadatabox.py               | 1 +
 picard/ui/options/cdlookup.py          | 1 +
 picard/ui/options/interface.py         | 1 +
 picard/ui/options/plugins.py           | 1 +
 picard/ui/options/releases.py          | 1 +
 picard/ui/options/renaming.py          | 1 +
 picard/util/__init__.py                | 1 +
 picard/util/bytes2human.py             | 1 +
 picard/util/cdrom.py                   | 1 +
 picard/util/icontheme.py               | 1 +
 picard/util/textencoding.py            | 1 +
 picard/util/versions.py                | 1 +
 picard/util/xml.py                     | 1 +
 picard/webservice/__init__.py          | 1 +
 picard/webservice/api_helpers.py       | 1 +
 picard/webservice/ratecontrol.py       | 1 +
 test/__init__.py                       | 1 +
 test/formats/common.py                 | 1 +
 test/formats/test_apev2.py             | 1 +
 test/formats/test_vorbis.py            | 1 +
 test/test_acoustid.py                  | 1 +
 test/test_browser.py                   | 1 +
 test/test_filesystem.py                | 1 +
 test/test_mbjson.py                    | 1 +
 test/test_metadata.py                  | 1 +
 test/test_releaseversions.py           | 1 +
 test/test_scripttofilename.py          | 1 +
 test/test_textencoding.py              | 1 +
 test/test_util_astrcmp.py              | 1 +
 test/test_utils.py                     | 1 +
 test/test_webservice.py                | 1 +
 51 files changed, 51 insertions(+)

diff --git a/.isort.cfg b/.isort.cfg
index 3fa2b751d..7f85c9269 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -24,3 +24,4 @@ skip_glob=**/picard/ui/ui_*.py
 skip=./tagger.py,picard/const/attributes.py,picard/const/countries.py,picard/resources.py,scripts/picard.in,picard/const/__init__.py,picard/formats/__init__.py,picard/coverart/providers/__init__.py
 not_skip=__init__.py
 use_parentheses=1
+lines_after_imports=2
diff --git a/picard/__init__.py b/picard/__init__.py
index d52183baa..ac5bcdd9e 100644
--- a/picard/__init__.py
+++ b/picard/__init__.py
@@ -19,6 +19,7 @@
 
 import re
 
+
 PICARD_ORG_NAME = "MusicBrainz"
 PICARD_APP_NAME = "Picard"
 PICARD_VERSION = (2, 2, 0, 'dev', 1)
diff --git a/picard/collection.py b/picard/collection.py
index 058c39322..75eb4afb4 100644
--- a/picard/collection.py
+++ b/picard/collection.py
@@ -26,6 +26,7 @@ from picard import (
     log,
 )
 
+
 user_collections = {}
 
 
diff --git a/picard/config_upgrade.py b/picard/config_upgrade.py
index 1a3c3cc7c..64bfc82a5 100644
--- a/picard/config_upgrade.py
+++ b/picard/config_upgrade.py
@@ -33,6 +33,7 @@ from picard.const import (
     DEFAULT_NUMBERED_SCRIPT_NAME,
 )
 
+
 # TO ADD AN UPGRADE HOOK:
 # ----------------------
 # add a function here, named after the version you want upgrade to
diff --git a/picard/const/sys.py b/picard/const/sys.py
index e92046eeb..baa80732f 100644
--- a/picard/const/sys.py
+++ b/picard/const/sys.py
@@ -19,6 +19,7 @@
 
 import sys
 
+
 IS_WIN = sys.platform == 'win32'
 IS_LINUX = sys.platform == 'linux'
 IS_MACOS = sys.platform == 'darwin'
diff --git a/picard/coverart/image.py b/picard/coverart/image.py
index 9e427abdd..c1e3e2ff1 100644
--- a/picard/coverart/image.py
+++ b/picard/coverart/image.py
@@ -45,6 +45,7 @@ from picard.util import (
 )
 from picard.util.scripttofilename import script_to_filename
 
+
 _datafiles = dict()
 _datafile_mutex = QMutex(QMutex.Recursive)
 
diff --git a/picard/coverart/providers/caa.py b/picard/coverart/providers/caa.py
index 2229af224..9e567b08d 100644
--- a/picard/coverart/providers/caa.py
+++ b/picard/coverart/providers/caa.py
@@ -59,6 +59,7 @@ from picard.util import webbrowser2
 from picard.ui.ui_provider_options_caa import Ui_CaaOptions
 from picard.ui.util import StandardButton
 
+
 CaaSizeItem = namedtuple('CaaSizeItem', ['thumbnail', 'label'])
 
 _CAA_THUMBNAIL_SIZE_MAP = OrderedDict([
diff --git a/picard/coverart/utils.py b/picard/coverart/utils.py
index 72b52805f..3fde017fc 100644
--- a/picard/coverart/utils.py
+++ b/picard/coverart/utils.py
@@ -20,6 +20,7 @@
 from picard.const import MB_ATTRIBUTES
 from picard.i18n import gettext_attr
 
+
 # list of types from http://musicbrainz.org/doc/Cover_Art/Types
 # order of declaration is preserved in selection box
 CAA_TYPES = []
diff --git a/picard/formats/apev2.py b/picard/formats/apev2.py
index 3375e3e87..5c8db4c17 100644
--- a/picard/formats/apev2.py
+++ b/picard/formats/apev2.py
@@ -45,6 +45,7 @@ from picard.util import (
 
 from .mutagenext import tak
 
+
 INVALID_CHARS = re.compile('[^\x20-\x7e]')
 BLACKLISTED_KEYS = ['ID3', 'TAG', 'OggS', 'MP+']
 UNSUPPORTED_TAGS = [
diff --git a/picard/formats/id3.py b/picard/formats/id3.py
index fa9d77b9a..8709b4bf6 100644
--- a/picard/formats/id3.py
+++ b/picard/formats/id3.py
@@ -44,6 +44,7 @@ from picard.util import (
     sanitize_date,
 )
 
+
 id3.GRP1 = compatid3.GRP1
 id3.TCMP = compatid3.TCMP
 id3.TSO2 = compatid3.TSO2
diff --git a/picard/formats/mutagenext/compatid3.py b/picard/formats/mutagenext/compatid3.py
index a1e5118d3..b788328c1 100644
--- a/picard/formats/mutagenext/compatid3.py
+++ b/picard/formats/mutagenext/compatid3.py
@@ -25,6 +25,7 @@ from mutagen.id3 import (
     TextFrame,
 )
 
+
 try:
     from mutagen.id3 import GRP1
 except ImportError:
diff --git a/picard/formats/vorbis.py b/picard/formats/vorbis.py
index d4c1bcf81..be37ee9ac 100644
--- a/picard/formats/vorbis.py
+++ b/picard/formats/vorbis.py
@@ -48,6 +48,7 @@ from picard.util import (
     sanitize_date,
 )
 
+
 INVALID_CHARS = re.compile('([^\x20-\x7d]|=)')
 
 
diff --git a/picard/i18n.py b/picard/i18n.py
index c2a6ff890..bbd37e073 100644
--- a/picard/i18n.py
+++ b/picard/i18n.py
@@ -29,6 +29,7 @@ from picard.const.sys import (
     IS_WIN,
 )
 
+
 builtins.__dict__['N_'] = lambda a: a
 
 
diff --git a/picard/log.py b/picard/log.py
index 5e5b6c6fa..0c805277e 100644
--- a/picard/log.py
+++ b/picard/log.py
@@ -28,6 +28,7 @@ from threading import Lock
 
 from PyQt5 import QtCore
 
+
 _MAX_TAIL_LEN = 10**6
 
 VERBOSITY_DEFAULT = logging.WARNING
diff --git a/picard/mbjson.py b/picard/mbjson.py
index 75b0ecca8..9e534390e 100644
--- a/picard/mbjson.py
+++ b/picard/mbjson.py
@@ -28,6 +28,7 @@ from picard.util import (
     translate_from_sortname,
 )
 
+
 _artist_rel_types = {
     "arranger": "arranger",
     "audio": "engineer",
diff --git a/picard/metadata.py b/picard/metadata.py
index 5d7ec149b..d15b57276 100644
--- a/picard/metadata.py
+++ b/picard/metadata.py
@@ -36,6 +36,7 @@ from picard.util import linear_combination_of_weights
 from picard.util.imagelist import ImageList
 from picard.util.tags import PRESERVED_TAGS
 
+
 MULTI_VALUED_JOINER = '; '
 
 # lengths difference over this number of milliseconds will give a score of 0.0
diff --git a/picard/plugin.py b/picard/plugin.py
index b3e3cfd19..a04899ecf 100644
--- a/picard/plugin.py
+++ b/picard/plugin.py
@@ -45,6 +45,7 @@ from picard.const import (
 )
 import picard.plugins
 
+
 _suffixes = [s[0] for s in imp.get_suffixes()]
 _package_entries = ["__init__.py", "__init__.pyc", "__init__.pyo"]
 _extension_points = []
diff --git a/picard/track.py b/picard/track.py
index cf3856be5..a5d8dadbb 100644
--- a/picard/track.py
+++ b/picard/track.py
@@ -52,6 +52,7 @@ from picard.util.textencoding import asciipunct
 
 from picard.ui.item import Item
 
+
 _TRANSLATE_TAGS = {
     "hip hop": "Hip-Hop",
     "synth-pop": "Synthpop",
diff --git a/picard/ui/filebrowser.py b/picard/ui/filebrowser.py
index 1c4420aa3..0f1634129 100644
--- a/picard/ui/filebrowser.py
+++ b/picard/ui/filebrowser.py
@@ -31,6 +31,7 @@ from picard.const.sys import IS_MACOS
 from picard.formats import supported_formats
 from picard.util import find_existing_path
 
+
 _default_current_browser_path = QStandardPaths.writableLocation(QStandardPaths.HomeLocation)
 
 
diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py
index eb8649836..b1f08ff35 100644
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -81,6 +81,7 @@ from picard.ui.util import (
     find_starting_directory,
 )
 
+
 ui_init = ExtensionPoint()
 
 
diff --git a/picard/ui/metadatabox.py b/picard/ui/metadatabox.py
index 9211e66f4..7dacb89fc 100644
--- a/picard/ui/metadatabox.py
+++ b/picard/ui/metadatabox.py
@@ -45,6 +45,7 @@ from picard.util.tags import display_tag_name
 
 from picard.ui.edittagdialog import EditTagDialog
 
+
 COMMON_TAGS = [
     "title",
     "artist",
diff --git a/picard/ui/options/cdlookup.py b/picard/ui/options/cdlookup.py
index a759313f8..679c4bfe0 100644
--- a/picard/ui/options/cdlookup.py
+++ b/picard/ui/options/cdlookup.py
@@ -30,6 +30,7 @@ from picard.ui.options import (
     register_options_page,
 )
 
+
 if AUTO_DETECT_DRIVES:
     from picard.ui.ui_options_cdlookup_select import Ui_CDLookupOptionsPage
 else:
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 08fd264c4..09c6e4300 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -39,6 +39,7 @@ from picard.ui.options import (
 from picard.ui.ui_options_interface import Ui_InterfaceOptionsPage
 from picard.ui.util import enabledSlot
 
+
 _default_starting_dir = QStandardPaths.writableLocation(QStandardPaths.HomeLocation)
 
 
diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index 3e02f39a6..c1131f37f 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -49,6 +49,7 @@ from picard.ui.options import (
 )
 from picard.ui.ui_options_plugins import Ui_PluginsOptionsPage
 
+
 COLUMN_NAME, COLUMN_VERSION, COLUMN_ACTIONS = range(3)
 
 
diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
index bb7f8a971..3e8ad7d79 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -41,6 +41,7 @@ from picard.ui.options import (
 )
 from picard.ui.ui_options_releases import Ui_ReleasesOptionsPage
 
+
 _DEFAULT_SCORE = 0.5
 _release_type_scores = [(g, _DEFAULT_SCORE) for g in list(RELEASE_PRIMARY_GROUPS.keys()) + list(RELEASE_SECONDARY_GROUPS.keys())]
 
diff --git a/picard/ui/options/renaming.py b/picard/ui/options/renaming.py
index 71c59d99e..784e324d9 100644
--- a/picard/ui/options/renaming.py
+++ b/picard/ui/options/renaming.py
@@ -47,6 +47,7 @@ from picard.ui.options.scripting import TaggerScriptSyntaxHighlighter
 from picard.ui.ui_options_renaming import Ui_RenamingOptionsPage
 from picard.ui.util import enabledSlot
 
+
 _default_music_dir = QStandardPaths.writableLocation(QStandardPaths.MusicLocation)
 
 
diff --git a/picard/util/__init__.py b/picard/util/__init__.py
index 631208f5c..3de4200fd 100644
--- a/picard/util/__init__.py
+++ b/picard/util/__init__.py
@@ -39,6 +39,7 @@ from picard.const.sys import (
     IS_WIN,
 )
 
+
 if IS_WIN:
     from ctypes import windll
 
diff --git a/picard/util/bytes2human.py b/picard/util/bytes2human.py
index a5073f5a3..73209e970 100644
--- a/picard/util/bytes2human.py
+++ b/picard/util/bytes2human.py
@@ -28,6 +28,7 @@ It supports i18n through gettext, decimal and binary units.
 
 import locale
 
+
 # used to force gettextization
 _BYTES_STRINGS_I18N = (
     N_('%s B'),
diff --git a/picard/util/cdrom.py b/picard/util/cdrom.py
index 3e9cc052a..c26ff43b2 100644
--- a/picard/util/cdrom.py
+++ b/picard/util/cdrom.py
@@ -30,6 +30,7 @@ from picard.const.sys import (
 )
 from picard.util import uniqify
 
+
 if IS_WIN:
     from ctypes import windll
 
diff --git a/picard/util/icontheme.py b/picard/util/icontheme.py
index d57a5ec07..ffcb91105 100644
--- a/picard/util/icontheme.py
+++ b/picard/util/icontheme.py
@@ -23,6 +23,7 @@ from PyQt5 import QtGui
 
 from picard.const.sys import IS_WIN
 
+
 if IS_WIN:
     _search_paths = []
 else:
diff --git a/picard/util/textencoding.py b/picard/util/textencoding.py
index 9ad99552f..4c96a6379 100644
--- a/picard/util/textencoding.py
+++ b/picard/util/textencoding.py
@@ -67,6 +67,7 @@ import unicodedata
 
 from picard.util import sanitize_filename
 
+
 #########################  LATIN SIMPLIFICATION ###########################
 # The translation tables for punctuation and latin combined-characters are taken from
 # http://unicode.org/repos/cldr/trunk/common/transforms/Latin-ASCII.xml
diff --git a/picard/util/versions.py b/picard/util/versions.py
index 3c99a972d..2ab0f0d75 100644
--- a/picard/util/versions.py
+++ b/picard/util/versions.py
@@ -33,6 +33,7 @@ from picard import PICARD_FANCY_VERSION_STR
 from picard.disc import discid_version
 from picard.util.astrcmp import astrcmp_implementation
 
+
 _versions = OrderedDict([
     ("version", PICARD_FANCY_VERSION_STR),
     ("python-version", python_version()),
diff --git a/picard/util/xml.py b/picard/util/xml.py
index 6bb887248..f9e9c9abb 100644
--- a/picard/util/xml.py
+++ b/picard/util/xml.py
@@ -23,6 +23,7 @@ import re
 
 from PyQt5.QtCore import QXmlStreamReader
 
+
 _node_name_re = re.compile('[^a-zA-Z0-9]')
 
 
diff --git a/picard/webservice/__init__.py b/picard/webservice/__init__.py
index 13de6af9e..023b267cb 100644
--- a/picard/webservice/__init__.py
+++ b/picard/webservice/__init__.py
@@ -60,6 +60,7 @@ from picard.util import (
 from picard.util.xml import parse_xml
 from picard.webservice import ratecontrol
 
+
 COUNT_REQUESTS_DELAY_MS = 250
 
 TEMP_ERRORS_RETRIES = 5
diff --git a/picard/webservice/api_helpers.py b/picard/webservice/api_helpers.py
index 9bf994e11..7913fd839 100644
--- a/picard/webservice/api_helpers.py
+++ b/picard/webservice/api_helpers.py
@@ -38,6 +38,7 @@ from picard.webservice import (
     ratecontrol,
 )
 
+
 ratecontrol.set_minimum_delay((ACOUSTID_HOST, ACOUSTID_PORT), 333)
 ratecontrol.set_minimum_delay((CAA_HOST, CAA_PORT), 0)
 
diff --git a/picard/webservice/ratecontrol.py b/picard/webservice/ratecontrol.py
index 916873b1a..6ae842296 100644
--- a/picard/webservice/ratecontrol.py
+++ b/picard/webservice/ratecontrol.py
@@ -27,6 +27,7 @@ import time
 
 from picard import log
 
+
 # ============================================================================
 # Throttling/congestion avoidance
 # ============================================================================
diff --git a/test/__init__.py b/test/__init__.py
index 419a5f1ca..65d06e0a2 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,5 +1,6 @@
 import glob
 import os.path
 
+
 for filename in glob.glob(os.path.join(os.path.dirname(__file__), "test_*.py")):
     __import__("test." + os.path.basename(filename)[:-3])
diff --git a/test/formats/common.py b/test/formats/common.py
index 2d58cfc93..0a0c63231 100644
--- a/test/formats/common.py
+++ b/test/formats/common.py
@@ -13,6 +13,7 @@ import picard.formats
 from picard.formats import ext_to_format
 from picard.metadata import Metadata
 
+
 settings = {
     'clear_existing_tags': False,
     'embed_only_one_front_image': False,
diff --git a/test/formats/test_apev2.py b/test/formats/test_apev2.py
index e847766da..3d81b28c5 100644
--- a/test/formats/test_apev2.py
+++ b/test/formats/test_apev2.py
@@ -9,6 +9,7 @@ from .common import (
 )
 from .coverart import CommonCoverArtTests
 
+
 VALID_KEYS = [
     ' valid Key}',
     '{ $ome tag~}',
diff --git a/test/formats/test_vorbis.py b/test/formats/test_vorbis.py
index 143fe61d4..be0b4c209 100644
--- a/test/formats/test_vorbis.py
+++ b/test/formats/test_vorbis.py
@@ -23,6 +23,7 @@ from .coverart import (
     file_save_image,
 )
 
+
 VALID_KEYS = [
     ' valid Key}',
     '{ $ome tag}',
diff --git a/test/test_acoustid.py b/test/test_acoustid.py
index 6ca725a19..6a817d13d 100644
--- a/test/test_acoustid.py
+++ b/test/test_acoustid.py
@@ -9,6 +9,7 @@ from picard.mbjson import recording_to_metadata
 from picard.metadata import Metadata
 from picard.track import Track
 
+
 settings = {
     "standardize_tracks": False,
     "standardize_artists": False,
diff --git a/test/test_browser.py b/test/test_browser.py
index 8cf5a49b9..50e742180 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -9,6 +9,7 @@ from test.picardtestcase import PicardTestCase
 from picard.browser.filelookup import FileLookup
 from picard.util import webbrowser2
 
+
 SERVER = 'musicbrainz.org'
 PORT = 443
 LOCAL_PORT = "8000"
diff --git a/test/test_filesystem.py b/test/test_filesystem.py
index b6005ff59..c9a3dded1 100644
--- a/test/test_filesystem.py
+++ b/test/test_filesystem.py
@@ -9,6 +9,7 @@ from test.picardtestcase import PicardTestCase
 from picard import config
 import picard.formats
 
+
 settings = {
     'enabled_plugins': '',
     'move_files': True,
diff --git a/test/test_mbjson.py b/test/test_mbjson.py
index d76b5d316..bdcfb9b6c 100644
--- a/test/test_mbjson.py
+++ b/test/test_mbjson.py
@@ -20,6 +20,7 @@ from picard.metadata import Metadata
 from picard.releasegroup import ReleaseGroup
 from picard.track import Track
 
+
 settings = {
     "standardize_tracks": False,
     "standardize_artists": False,
diff --git a/test/test_metadata.py b/test/test_metadata.py
index b05268a5c..4d91ebf38 100644
--- a/test/test_metadata.py
+++ b/test/test_metadata.py
@@ -9,6 +9,7 @@ from picard.metadata import (
 )
 from picard.util.tags import PRESERVED_TAGS
 
+
 settings = {
     'write_id3v23': False,
     'id3v23_join_with': '/',
diff --git a/test/test_releaseversions.py b/test/test_releaseversions.py
index 3baa7a2a6..65665d943 100644
--- a/test/test_releaseversions.py
+++ b/test/test_releaseversions.py
@@ -10,6 +10,7 @@ from picard import config
 from picard.i18n import setup_gettext
 from picard.releasegroup import ReleaseGroup
 
+
 settings = {
     "standardize_tracks": False,
     "standardize_artists": False,
diff --git a/test/test_scripttofilename.py b/test/test_scripttofilename.py
index b219271df..ab2e4ba6a 100644
--- a/test/test_scripttofilename.py
+++ b/test/test_scripttofilename.py
@@ -7,6 +7,7 @@ from picard.metadata import Metadata
 from picard.script import register_script_function
 from picard.util.scripttofilename import script_to_filename
 
+
 settings = {
     'ascii_filenames': False,
     'enabled_plugins': [],
diff --git a/test/test_textencoding.py b/test/test_textencoding.py
index 7caa89039..20aae94da 100644
--- a/test/test_textencoding.py
+++ b/test/test_textencoding.py
@@ -3,6 +3,7 @@ from test.picardtestcase import PicardTestCase
 
 from picard import util
 
+
 #from picard.util import textencoding
 
 # Set the value to true below to show the coverage of Latin characters
diff --git a/test/test_util_astrcmp.py b/test/test_util_astrcmp.py
index f94a98706..408452f81 100644
--- a/test/test_util_astrcmp.py
+++ b/test/test_util_astrcmp.py
@@ -5,6 +5,7 @@ from test.picardtestcase import PicardTestCase
 
 from picard.util.astrcmp import astrcmp_py
 
+
 try:
     from picard.util.astrcmp import astrcmp_c
 except ImportError:
diff --git a/test/test_utils.py b/test/test_utils.py
index 464fd53a2..dda87545e 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -15,6 +15,7 @@ from picard.util import (
     sort_by_similarity,
 )
 
+
 # ensure _() is defined
 if '_' not in builtins.__dict__:
     builtins.__dict__['_'] = lambda a: a
diff --git a/test/test_webservice.py b/test/test_webservice.py
index 313b513da..fc0b56103 100644
--- a/test/test_webservice.py
+++ b/test/test_webservice.py
@@ -14,6 +14,7 @@ from picard.webservice import (
     ratecontrol,
 )
 
+
 PROXY_SETTINGS = {
     "use_proxy": True,
     "proxy_server_host": '127.0.0.1',

From 81b9b1c59cf4f1d2b6e7843d416339c849005a75 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Thu, 4 Apr 2019 08:43:31 +0200
Subject: [PATCH 4/6] Documented use of pre-commit hook for isort check

---
 CONTRIBUTING.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 178730ed3..a4f8199c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,23 @@ As most of the other projects written in Python, we use the [PEP 8](https://www.
 
 The general idea is to make the code within a project consistent and easy to interpret (for humans).
 
-To fix or preserve imports style, one can use `isort -rc .` command (requires `isort` tool, see `.isort.cfg`).
+To fix or preserve imports style, one can use `isort -rc .` command (requires the [isort](https://github.com/timothycrosley/isort) tool, see `.isort.cfg`).
+
+It is recommended to add a pre-commit hook to check whether imports in changed code
+follow the conventions. Add a file `.git/hooks/pre-commit` with the following content
+and make it executable:
+
+```bash
+#!/usr/bin/env bash
+
+PYFILES=$(git diff --cached --name-only | grep "\\.py$")
+
+if [ ! -z "$PYFILES" ]; then
+	set -e
+	isort --check-only $PYFILES
+fi
+```
+
 
 ### Docstrings
 
@@ -18,6 +34,7 @@ Unless the function is easy to understand quickly, it should probably have a doc
 
 We recommend using ["Google-style" docstrings](https://google.github.io/styleguide/pyguide.html?showone=Comments#Comments) for writing docstrings.
 
+
 ### Picard specific code
 
 Picard has some auto-generated `picard/ui/ui_*.py` PyQt UI related files. Please do not change them directly. To modify them, use Qt-Designer to edit the `ui/*.ui` and use the command `python setup.py build_ui` to generate the corresponding `ui_*.py` files.
@@ -26,6 +43,7 @@ We use snake-case to name all functions and variables except for the pre-generat
 
 `gettext` and `gettext-noop` have been built-in the Picard code as `_` and `N_` respectively to provide support for internationalization/localization. You can use them without imports across all of Picard code. Make sure to mark all displayable strings for translation using `_` or `N_` as applicable. You can read more about python-gettext [here](https://docs.python.org/2/library/gettext.html).
 
+
 ## Git Work-flow
 
 We follow the "typical" GitHub workflow when contributing changes:

From af255c32a0d337e7217d7afa25f7eb8698b9bf4e Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Thu, 4 Apr 2019 08:48:34 +0200
Subject: [PATCH 5/6] Run isort on Travis CI

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6999f19eb..dac45f4a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ env:
   global:
   - PIP_INSTALL="pip3 install"
   - INSTALL_DEPS="$PIP_INSTALL -r requirements.txt"
-  - PYTEST="$PIP_INSTALL pytest pytest-randomly pytest-cov"
+  - INSTALL_TEST_TOOLS="$PIP_INSTALL pytest pytest-randomly pytest-cov isort==4.3.10"
   - CODACY="$PIP_INSTALL codacy-coverage"
   - LIBDISCID="libdiscid0 libdiscid-dev"
   matrix:
@@ -56,9 +56,11 @@ before_install:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source bin/activate; fi
 - "$INSTALL_DEPS"
-- "$PYTEST"
+- "$INSTALL_TEST_TOOLS"
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/package-osx.sh; fi
-script: py.test -v --cov=picard --cov-report xml:coverage.xml
+script:
+- py.test -v --cov=picard --cov-report xml:coverage.xml
+- isort --check-only $(git ls-tree -r --name-only $(git rev-parse HEAD) | grep "\\.py$")
 after_success:
 - if [ ! -z "${CODACY_PROJECT_TOKEN}" ]; then $CODACY; python-codacy-coverage -r coverage.xml;
   fi

From bdeaa32967029122fed238c8bb0310e1894474c2 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Thu, 4 Apr 2019 15:44:00 +0200
Subject: [PATCH 6/6] CI: Run isort with --diff --quiet

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dac45f4a5..22e843e0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ before_install:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/package-osx.sh; fi
 script:
 - py.test -v --cov=picard --cov-report xml:coverage.xml
-- isort --check-only $(git ls-tree -r --name-only $(git rev-parse HEAD) | grep "\\.py$")
+- isort --check-only --diff --quiet $(git ls-tree -r --name-only $(git rev-parse HEAD) | grep "\\.py$")
 after_success:
 - if [ ! -z "${CODACY_PROJECT_TOKEN}" ]; then $CODACY; python-codacy-coverage -r coverage.xml;
   fi