From f85ea2a39d9d87e5da491847a4bd3ad165fbd5ca Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 12 Apr 2015 23:03:46 +0200 Subject: [PATCH] flake8: Fix new import order warnings (cherry picked from commit 71ab9733c760b68a49fa80f21793e1dbcdc3d86f) --- mopidy/audio/actor.py | 2 +- mopidy/audio/scan.py | 2 +- mopidy/utils/deps.py | 4 ++-- tests/audio/test_actor.py | 4 ++-- tests/stream/test_library.py | 4 ++-- tests/utils/test_deps.py | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 35bd215f..e0a7892a 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -8,7 +8,7 @@ import gobject import pygst pygst.require('0.10') import gst # noqa -import gst.pbutils +import gst.pbutils # noqa import pykka diff --git a/mopidy/audio/scan.py b/mopidy/audio/scan.py index f2a93620..d1e83407 100644 --- a/mopidy/audio/scan.py +++ b/mopidy/audio/scan.py @@ -6,7 +6,7 @@ import collections import pygst pygst.require('0.10') import gst # noqa -import gst.pbutils +import gst.pbutils # noqa from mopidy import exceptions from mopidy.audio import utils diff --git a/mopidy/utils/deps.py b/mopidy/utils/deps.py index bc9f7c2f..aafede9d 100644 --- a/mopidy/utils/deps.py +++ b/mopidy/utils/deps.py @@ -5,12 +5,12 @@ import os import platform import sys +import pkg_resources + import pygst pygst.require('0.10') import gst # noqa -import pkg_resources - from mopidy.utils import formatting diff --git a/tests/audio/test_actor.py b/tests/audio/test_actor.py index fbc440de..b00646bc 100644 --- a/tests/audio/test_actor.py +++ b/tests/audio/test_actor.py @@ -6,12 +6,12 @@ import unittest import gobject gobject.threads_init() +import mock + import pygst pygst.require('0.10') import gst # noqa -import mock - import pykka from mopidy import audio diff --git a/tests/stream/test_library.py b/tests/stream/test_library.py index 93292376..65c59cb6 100644 --- a/tests/stream/test_library.py +++ b/tests/stream/test_library.py @@ -5,12 +5,12 @@ import unittest import gobject gobject.threads_init() +import mock + import pygst pygst.require('0.10') import gst # noqa: pygst magic is needed to import correct gst -import mock - from mopidy.models import Track from mopidy.stream import actor from mopidy.utils.path import path_to_uri diff --git a/tests/utils/test_deps.py b/tests/utils/test_deps.py index 95f5b982..3b06973f 100644 --- a/tests/utils/test_deps.py +++ b/tests/utils/test_deps.py @@ -6,12 +6,12 @@ import unittest import mock +import pkg_resources + import pygst pygst.require('0.10') import gst # noqa -import pkg_resources - from mopidy.utils import deps