From 5daa221547e2e681ce7ff900a44e99d1aba7d0c5 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Fri, 30 Nov 2018 12:05:01 +0100
Subject: [PATCH] Run isort -rc to unify imports

---
 picard/album.py           | 2 +-
 picard/browser/browser.py | 4 +---
 picard/cluster.py         | 2 +-
 picard/coverart/image.py  | 4 +---
 picard/file.py            | 4 +---
 picard/script.py          | 1 -
 picard/track.py           | 2 +-
 setup.py                  | 5 ++++-
 test/test_formats.py      | 3 ++-
 9 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/picard/album.py b/picard/album.py
index 4430440f7..a36226439 100644
--- a/picard/album.py
+++ b/picard/album.py
@@ -61,7 +61,7 @@ from picard.util import (
 from picard.util.imagelist import (
     add_metadata_images,
     remove_metadata_images,
-    update_metadata_images
+    update_metadata_images,
 )
 from picard.util.textencoding import asciipunct
 
diff --git a/picard/browser/browser.py b/picard/browser/browser.py
index 2248a0044..41b41547d 100644
--- a/picard/browser/browser.py
+++ b/picard/browser/browser.py
@@ -22,9 +22,7 @@ from urllib.parse import (
     urlparse,
 )
 
-from PyQt5 import (
-    QtNetwork,
-)
+from PyQt5 import QtNetwork
 
 from picard import (
     config,
diff --git a/picard/cluster.py b/picard/cluster.py
index b071df316..595e497db 100644
--- a/picard/cluster.py
+++ b/picard/cluster.py
@@ -40,7 +40,7 @@ from picard.util import (
 from picard.util.imagelist import (
     add_metadata_images,
     remove_metadata_images,
-    update_metadata_images
+    update_metadata_images,
 )
 
 from picard.ui.item import Item
diff --git a/picard/coverart/image.py b/picard/coverart/image.py
index 86413c3ca..bea84d230 100644
--- a/picard/coverart/image.py
+++ b/picard/coverart/image.py
@@ -46,9 +46,7 @@ from picard.util import (
     imageinfo,
     replace_win32_incompat,
 )
-from picard.util.textencoding import (
-    replace_non_ascii,
-)
+from picard.util.textencoding import replace_non_ascii
 
 _datafiles = dict()
 _datafile_mutex = QMutex(QMutex.Recursive)
diff --git a/picard/file.py b/picard/file.py
index f5796bebe..715327774 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -50,9 +50,7 @@ from picard.util import (
 )
 from picard.util.filenaming import make_short_filename
 from picard.util.tags import PRESERVED_TAGS
-from picard.util.textencoding import (
-    replace_non_ascii,
-)
+from picard.util.textencoding import replace_non_ascii
 
 from picard.ui.item import Item
 
diff --git a/picard/script.py b/picard/script.py
index 16606eb25..9d4afb959 100644
--- a/picard/script.py
+++ b/picard/script.py
@@ -27,7 +27,6 @@ import operator
 import re
 import unicodedata
 
-
 from picard import config
 from picard.metadata import (
     MULTI_VALUED_JOINER,
diff --git a/picard/track.py b/picard/track.py
index 762343369..bee020e5b 100644
--- a/picard/track.py
+++ b/picard/track.py
@@ -46,7 +46,7 @@ from picard.script import (
 from picard.util.imagelist import (
     add_metadata_images,
     remove_metadata_images,
-    update_metadata_images
+    update_metadata_images,
 )
 from picard.util.textencoding import asciipunct
 
diff --git a/setup.py b/setup.py
index 107cddaff..668fdeac9 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,10 @@ from setuptools import (
 )
 from setuptools.dist import Distribution
 
-from picard import PICARD_VERSION, __version__
+from picard import (
+    PICARD_VERSION,
+    __version__,
+)
 
 if sys.version_info < (3, 5):
     sys.exit("ERROR: You need Python 3.5 or higher to use Picard.")
diff --git a/test/test_formats.py b/test/test_formats.py
index 9fae60654..c75b252d1 100644
--- a/test/test_formats.py
+++ b/test/test_formats.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 import logging
-import mutagen
 import os.path
 import shutil
 from tempfile import mkstemp
 from test.picardtestcase import PicardTestCase
 import unittest
 
+import mutagen
+
 from PyQt5 import QtCore
 
 from picard import (