From be75583546d9a941e99f84d1f8221403ab02b7c9 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Fri, 27 Dec 2013 23:56:25 +0100 Subject: [PATCH] Remove unused imports --- picard/acoustid.py | 2 +- picard/cluster.py | 3 +-- picard/config.py | 2 +- picard/const.py | 1 - picard/coverart.py | 3 +-- picard/file.py | 2 -- picard/formats/mutagenext/compatid3.py | 2 +- picard/releasegroup.py | 3 +-- picard/tagger.py | 2 -- picard/ui/infostatus.py | 1 - picard/ui/mainwindow.py | 1 - picard/ui/options/dialog.py | 1 - picard/ui/options/fingerprinting.py | 2 +- picard/ui/options/metadata.py | 1 - picard/ui/passworddialog.py | 2 +- picard/util/thread.py | 2 +- 16 files changed, 9 insertions(+), 21 deletions(-) diff --git a/picard/acoustid.py b/picard/acoustid.py index 2d7b526f1..c50c7e532 100644 --- a/picard/acoustid.py +++ b/picard/acoustid.py @@ -21,7 +21,7 @@ from collections import deque from functools import partial from PyQt4 import QtCore from picard import config, log -from picard.const import ACOUSTID_KEY, FPCALC_NAMES +from picard.const import FPCALC_NAMES from picard.util import find_executable from picard.webservice import XmlNode diff --git a/picard/cluster.py b/picard/cluster.py index c14e47818..0977b6672 100644 --- a/picard/cluster.py +++ b/picard/cluster.py @@ -24,10 +24,9 @@ from heapq import heappush, heappop from PyQt4 import QtCore from picard import config from picard.metadata import Metadata -from picard.similarity import similarity2, similarity +from picard.similarity import similarity from picard.ui.item import Item from picard.util import format_time -from picard.mbxml import artist_credit_from_node class Cluster(QtCore.QObject, Item): diff --git a/picard/config.py b/picard/config.py index 5a4f8c176..983091980 100644 --- a/picard/config.py +++ b/picard/config.py @@ -20,7 +20,7 @@ from operator import itemgetter from PyQt4 import QtCore from picard import (PICARD_APP_NAME, PICARD_ORG_NAME, PICARD_VERSION, - version_to_string, version_from_string, log) + version_to_string, version_from_string) from picard.util import LockableObject, rot13 diff --git a/picard/const.py b/picard/const.py index 31152db57..68af4f98b 100644 --- a/picard/const.py +++ b/picard/const.py @@ -19,7 +19,6 @@ import os import sys -import re # Install gettext "noop" function in case const.py gets imported directly. import __builtin__ diff --git a/picard/coverart.py b/picard/coverart.py index df5cac28d..a71264f0f 100644 --- a/picard/coverart.py +++ b/picard/coverart.py @@ -24,10 +24,9 @@ import json import re import traceback -import picard.webservice from functools import partial from picard import config, log -from picard.metadata import Metadata, is_front_image +from picard.metadata import is_front_image from picard.util import mimetype, parse_amazon_url from picard.const import CAA_HOST, CAA_PORT from PyQt4.QtCore import QUrl, QObject diff --git a/picard/file.py b/picard/file.py index 3536ddce6..a9c7f8cf3 100644 --- a/picard/file.py +++ b/picard/file.py @@ -29,11 +29,9 @@ from operator import itemgetter from collections import defaultdict from PyQt4 import QtCore from picard import config, log -from picard.track import Track from picard.metadata import Metadata from picard.ui.item import Item from picard.script import ScriptParser -from picard.similarity import similarity2 from picard.util import ( decode_filename, encode_filename, diff --git a/picard/formats/mutagenext/compatid3.py b/picard/formats/mutagenext/compatid3.py index aa3612645..a3098c5eb 100644 --- a/picard/formats/mutagenext/compatid3.py +++ b/picard/formats/mutagenext/compatid3.py @@ -22,7 +22,7 @@ import struct from struct import pack, unpack import mutagen from mutagen._util import insert_bytes -from mutagen.id3 import ID3, Frame, Frames, Frames_2_2, TextFrame, TORY, \ +from mutagen.id3 import ID3, Frames, Frames_2_2, TextFrame, TORY, \ TYER, TIME, APIC, IPLS, TDAT, BitPaddedInt, MakeID3v1 diff --git a/picard/releasegroup.py b/picard/releasegroup.py index 70d4bc031..274ecba28 100644 --- a/picard/releasegroup.py +++ b/picard/releasegroup.py @@ -21,8 +21,7 @@ import traceback from collections import defaultdict from functools import partial from itertools import combinations -from PyQt4 import QtCore -from picard import config, log +from picard import log from picard.metadata import Metadata from picard.dataobj import DataObject from picard.mbxml import media_formats_from_node, label_info_from_node diff --git a/picard/tagger.py b/picard/tagger.py index b2d2208af..f5904fa51 100644 --- a/picard/tagger.py +++ b/picard/tagger.py @@ -26,7 +26,6 @@ import re import shutil import signal import sys -from collections import deque from functools import partial from itertools import chain @@ -61,7 +60,6 @@ from picard.track import Track, NonAlbumTrack from picard.releasegroup import ReleaseGroup from picard.collection import load_user_collections from picard.ui.mainwindow import MainWindow -from picard.ui.itemviews import BaseTreeView from picard.plugin import PluginManager from picard.acoustidmanager import AcoustIDManager from picard.util import ( diff --git a/picard/ui/infostatus.py b/picard/ui/infostatus.py index 769a5b9db..bfb1c8dce 100644 --- a/picard/ui/infostatus.py +++ b/picard/ui/infostatus.py @@ -18,7 +18,6 @@ from PyQt4 import QtCore, QtGui from PyQt4.QtGui import QIcon -from picard import config from picard.util import icontheme from picard.ui.ui_infostatus import Ui_InfoStatus diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 6d4ad1c2d..3e27eafc7 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -22,7 +22,6 @@ from PyQt4 import QtCore, QtGui import sys import os.path -from functools import partial from picard import config, log from picard.file import File from picard.track import Track diff --git a/picard/ui/options/dialog.py b/picard/ui/options/dialog.py index 6a27b107b..9c49cfeb7 100644 --- a/picard/ui/options/dialog.py +++ b/picard/ui/options/dialog.py @@ -19,7 +19,6 @@ from PyQt4 import QtCore, QtGui from picard import config -from picard.plugin import ExtensionPoint from picard.util import webbrowser2 from picard.ui.util import StandardButton from picard.ui.options import ( diff --git a/picard/ui/options/fingerprinting.py b/picard/ui/options/fingerprinting.py index 52f0bc355..3a3e434ce 100644 --- a/picard/ui/options/fingerprinting.py +++ b/picard/ui/options/fingerprinting.py @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import os -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui from picard import config from picard.util import webbrowser2, find_executable from picard.const import FPCALC_NAMES diff --git a/picard/ui/options/metadata.py b/picard/ui/options/metadata.py index 6ee2eba21..410535844 100644 --- a/picard/ui/options/metadata.py +++ b/picard/ui/options/metadata.py @@ -17,7 +17,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from PyQt4 import QtCore from picard import config from picard.ui.options import OptionsPage, register_options_page from picard.ui.ui_options_metadata import Ui_MetadataOptionsPage diff --git a/picard/ui/passworddialog.py b/picard/ui/passworddialog.py index 804e7e062..32335f519 100644 --- a/picard/ui/passworddialog.py +++ b/picard/ui/passworddialog.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui from picard import config from picard.ui.ui_passworddialog import Ui_PasswordDialog from picard.util import rot13 diff --git a/picard/util/thread.py b/picard/util/thread.py index 8c9b36fbf..095f8bbab 100644 --- a/picard/util/thread.py +++ b/picard/util/thread.py @@ -19,7 +19,7 @@ import sys import traceback -from PyQt4.QtCore import QThreadPool, QRunnable, QCoreApplication, QEvent +from PyQt4.QtCore import QRunnable, QCoreApplication, QEvent class ProxyToMainEvent(QEvent):