From c2c37c8037ee4ab1f1f2f1823153efd23e85fc0d Mon Sep 17 00:00:00 2001 From: Sophist Date: Wed, 17 May 2017 15:07:12 +0100 Subject: [PATCH] Remove unused variables --- picard/acoustidmanager.py | 5 +---- picard/script.py | 2 +- picard/ui/options/plugins.py | 7 +++---- setup.py | 1 - test/test_utils.py | 1 - 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/picard/acoustidmanager.py b/picard/acoustidmanager.py index 9fb477f23..57f0c3da5 100644 --- a/picard/acoustidmanager.py +++ b/picard/acoustidmanager.py @@ -66,10 +66,7 @@ class AcoustIDManager(QtCore.QObject): yield submission def _check_unsubmitted(self): - enabled = False - for submission in self._unsubmitted(): - enabled = True - break + enabled = next(self._unsubmitted(), None) != None self.tagger.window.enable_submit(enabled) def submit(self): diff --git a/picard/script.py b/picard/script.py index c2e32d51e..ae2f1d415 100644 --- a/picard/script.py +++ b/picard/script.py @@ -717,7 +717,7 @@ def func_initials(parser, text=""): def func_firstwords(parser, text, length): try: length = int(length) - except ValueError as e: + except ValueError: length = 0 if len(text) <= length: return text diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py index f70c1884d..307eb852d 100644 --- a/picard/ui/options/plugins.py +++ b/picard/ui/options/plugins.py @@ -145,21 +145,20 @@ class PluginsOptionsPage(OptionsPage): if latest.split('.') > plugin.version.split('.'): plugin.new_version = latest plugin.can_be_updated = True - item = self.add_plugin_item(plugin) + self.add_plugin_item(plugin) installed.append(plugin.module_name) for plugin in sorted(self.tagger.pluginmanager.available_plugins, key=attrgetter('name')): if plugin.module_name not in installed: plugin.can_be_downloaded = True - item = self.add_plugin_item(plugin) + self.add_plugin_item(plugin) self._user_interaction(True) def _remove_all(self): for i, p in self.items.items(): idx = self.ui.plugins.indexOfTopLevelItem(i) - item = self.ui.plugins.takeTopLevelItem(idx) - del item + self.ui.plugins.takeTopLevelItem(idx) self.items = {} def restore_defaults(self): diff --git a/setup.py b/setup.py index 9a2042174..a88f4d9cb 100755 --- a/setup.py +++ b/setup.py @@ -375,7 +375,6 @@ class picard_clean_ui(Command): pass def run(self): - from PyQt5 import uic for uifile, pyfile in ui_files(): try: os.unlink(pyfile) diff --git a/test/test_utils.py b/test/test_utils.py index 6cd927bb5..4fdfe8cbc 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -154,7 +154,6 @@ class AlbumArtistFromPathTest(unittest.TestCase): def test_album_artist_from_path(self): aafp = util.album_artist_from_path - from picard.file import File file_1 = r"/10cc/Original Soundtrack/02 I'm Not in Love.mp3" file_2 = r"/10cc - Original Soundtrack/02 I'm Not in Love.mp3" file_3 = r"/Original Soundtrack/02 I'm Not in Love.mp3"