From 257c42e11160dc90fcf03f17917aac2be9d88cc7 Mon Sep 17 00:00:00 2001 From: jradtilbrook Date: Sat, 4 Nov 2017 19:57:45 +0800 Subject: [PATCH 1/2] flake8: fix bare except clause --- mopidy/m3u/playlists.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: From f00fd8e1dffc30853340b68d37739b8151baad4c Mon Sep 17 00:00:00 2001 From: jradtilbrook Date: Sat, 4 Nov 2017 20:34:05 +0800 Subject: [PATCH 2/2] flake8: fix import order violations --- mopidy/__main__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 7963900e..e5c0f480 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -5,6 +5,10 @@ import os import signal import sys +import pykka.debug + +from mopidy import commands, config as config_lib, ext +from mopidy.internal import encoding, log, path, process, versioning from mopidy.internal.gi import Gst # noqa: F401 try: @@ -15,11 +19,6 @@ try: except ImportError: pass -import pykka.debug - -from mopidy import commands, config as config_lib, ext -from mopidy.internal import encoding, log, path, process, versioning - logger = logging.getLogger(__name__)