diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 7963900e..7cb5ab9f 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -15,7 +15,7 @@ try: except ImportError: pass -import pykka.debug +import pykka.debug # noqa: I100 from mopidy import commands, config as config_lib, ext from mopidy.internal import encoding, log, path, process, versioning diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index 03efd6a8..ad9acba9 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -8,7 +8,6 @@ import os import pykka import mopidy - from mopidy import audio, backend, mixer from mopidy.audio import PlaybackState from mopidy.core.history import HistoryController diff --git a/mopidy/local/json.py b/mopidy/local/json.py index 2e39b68b..7e26b6db 100644 --- a/mopidy/local/json.py +++ b/mopidy/local/json.py @@ -7,7 +7,6 @@ import re import sys import mopidy - from mopidy import compat, local, models from mopidy.internal import storage as internal_storage from mopidy.internal import timer diff --git a/mopidy/m3u/playlists.py b/mopidy/m3u/playlists.py index 28be28d9..fe83f663 100644 --- a/mopidy/m3u/playlists.py +++ b/mopidy/m3u/playlists.py @@ -34,7 +34,7 @@ def replace(path, mode='w+b', encoding=None, errors=None): (fd, tempname) = tempfile.mkstemp(dir=os.path.dirname(path)) try: fp = io.open(fd, mode, encoding=encoding, errors=errors) - except: + except Exception: os.remove(tempname) os.close(fd) raise @@ -43,7 +43,7 @@ def replace(path, mode='w+b', encoding=None, errors=None): fp.flush() os.fsync(fd) os.rename(tempname, path) - except: + except Exception: os.remove(tempname) raise finally: diff --git a/tests/core/test_actor.py b/tests/core/test_actor.py index c5da74d1..66e7ee9c 100644 --- a/tests/core/test_actor.py +++ b/tests/core/test_actor.py @@ -10,10 +10,10 @@ import mock import pykka import mopidy - from mopidy.core import Core from mopidy.internal import models, storage, versioning from mopidy.models import Track + from tests import dummy_mixer diff --git a/tests/core/test_mixer.py b/tests/core/test_mixer.py index 996b7c23..38ff091d 100644 --- a/tests/core/test_mixer.py +++ b/tests/core/test_mixer.py @@ -8,6 +8,7 @@ import pykka from mopidy import core, mixer from mopidy.internal.models import MixerState + from tests import dummy_mixer