Fix all import order warnings

mopidy/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
-from distutils.version import StrictVersion as SV
 import sys
 import warnings
+from distutils.version import StrictVersion as SV
 
 import pykka
 

mopidy/__main__.py

@@ -25,8 +25,7 @@ mopidy_args = sys.argv[1:]
 sys.argv[1:] = []
 
 
-from mopidy import commands, ext
+from mopidy import commands, config as config_lib, ext
-from mopidy import config as config_lib
 from mopidy.utils import log, path, process, versioning
 
 logger = logging.getLogger(__name__)

mopidy/audio/actor.py

@@ -1,19 +1,20 @@
 from __future__ import unicode_literals
 
-import pygst
-pygst.require('0.10')
-import gst
-import gobject
-
 import logging
 
+import gobject
+
+import pygst
+pygst.require('0.10')
+import gst  # noqa
+
 import pykka
 
+from mopidy.audio import mixers, playlists, utils
+from mopidy.audio.constants import PlaybackState
+from mopidy.audio.listener import AudioListener
 from mopidy.utils import process
 
-from . import mixers, playlists, utils
-from .constants import PlaybackState
-from .listener import AudioListener
 
 logger = logging.getLogger(__name__)
 

mopidy/audio/mixers/__init__.py

@@ -1,12 +1,13 @@
 from __future__ import unicode_literals
 
+import gobject
+
 import pygst
 pygst.require('0.10')
-import gst
+import gst  # noqa
-import gobject
 
-from .auto import AutoAudioMixer
+from mopidy.audio.mixers.auto import AutoAudioMixer
-from .fake import FakeMixer
+from mopidy.audio.mixers.fake import FakeMixer
 
 
 def register_mixer(mixer_class):

mopidy/audio/mixers/auto.py

@@ -6,11 +6,12 @@ mixer.
 
 from __future__ import unicode_literals
 
+import logging
+
 import pygst
 pygst.require('0.10')
-import gst
+import gst  # noqa
 
-import logging
 
 logger = logging.getLogger(__name__)
 

mopidy/audio/mixers/fake.py

@@ -6,12 +6,13 @@ mixer.
 
 from __future__ import unicode_literals
 
+import gobject
+
 import pygst
 pygst.require('0.10')
-import gobject
+import gst  # noqa
-import gst
 
-from . import utils
+from mopidy.audio.mixers import utils
 
 
 class FakeMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):

mopidy/audio/mixers/utils.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
+import gobject
+
 import pygst
 pygst.require('0.10')
-import gst
+import gst  # noqa
-import gobject
 
 
 def create_track(label, initial_volume, min_volume, max_volume,

mopidy/audio/playlists.py

@@ -1,13 +1,14 @@
 from __future__ import unicode_literals
 
-import pygst
-pygst.require('0.10')
-import gst
-import gobject
-
 import ConfigParser as configparser
 import io
 
+import gobject
+
+import pygst
+pygst.require('0.10')
+import gst  # noqa
+
 try:
     import xml.etree.cElementTree as elementtree
 except ImportError:

mopidy/audio/scan.py

@@ -1,15 +1,15 @@
 from __future__ import unicode_literals
 
-import pygst
-pygst.require('0.10')
-import gst
-
 import datetime
 import os
 import time
 
+import pygst
+pygst.require('0.10')
+import gst  # noqa
+
 from mopidy import exceptions
-from mopidy.models import Track, Artist, Album
+from mopidy.models import Album, Artist, Track
 from mopidy.utils import path
 
 

mopidy/audio/utils.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import pygst
 pygst.require('0.10')
-import gst
+import gst  # noqa
 
 
 def calculate_duration(num_samples, sample_rate):

mopidy/commands.py

@@ -7,6 +7,7 @@ import os
 import sys
 
 import glib
+
 import gobject
 
 from mopidy import config as config_lib

mopidy/config/types.py

@@ -4,8 +4,8 @@ import logging
 import re
 import socket
 
-from mopidy.utils import path
 from mopidy.config import validators
+from mopidy.utils import path
 
 
 def decode(value):

mopidy/core/actor.py

@@ -7,14 +7,13 @@ import pykka
 
 from mopidy import audio, backend
 from mopidy.audio import PlaybackState
+from mopidy.core.library import LibraryController
+from mopidy.core.listener import CoreListener
+from mopidy.core.playback import PlaybackController
+from mopidy.core.playlists import PlaylistsController
+from mopidy.core.tracklist import TracklistController
 from mopidy.utils import versioning
 
-from .library import LibraryController
-from .listener import CoreListener
-from .playback import PlaybackController
-from .playlists import PlaylistsController
-from .tracklist import TracklistController
-
 
 class Core(pykka.ThreadingActor, audio.AudioListener, backend.BackendListener):
     library = None

mopidy/core/playback.py

@@ -4,8 +4,7 @@ import logging
 import urlparse
 
 from mopidy.audio import PlaybackState
-
+from mopidy.core import listener
-from . import listener
 
 
 logger = logging.getLogger(__name__)

mopidy/core/tracklist.py

@@ -4,10 +4,9 @@ import collections
 import logging
 import random
 
+from mopidy.core import listener
 from mopidy.models import TlTrack
 
-from . import listener
-
 
 logger = logging.getLogger(__name__)
 

mopidy/ext.py

@@ -2,10 +2,10 @@ from __future__ import unicode_literals
 
 import collections
 import logging
+
 import pkg_resources
 
-from mopidy import exceptions
+from mopidy import config as config_lib, exceptions
-from mopidy import config as config_lib
 
 
 logger = logging.getLogger(__name__)

mopidy/http/actor.py

@@ -1,17 +1,19 @@
 from __future__ import unicode_literals
 
-import logging
 import json
+import logging
 import os
 
 import cherrypy
+
 import pykka
+
 from ws4py.messaging import TextMessage
 from ws4py.server.cherrypyserver import WebSocketPlugin, WebSocketTool
 
 from mopidy import models, zeroconf
 from mopidy.core import CoreListener
-from . import ws
+from mopidy.http import ws
 
 
 logger = logging.getLogger(__name__)

mopidy/http/ws.py

@@ -4,6 +4,7 @@ import logging
 import socket
 
 import cherrypy
+
 import ws4py.websocket
 
 from mopidy import core, models

mopidy/listener.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 import logging
 
 import gobject
+
 import pykka
 
 logger = logging.getLogger(__name__)

mopidy/local/actor.py

@@ -5,11 +5,11 @@ import logging
 import pykka
 
 from mopidy import backend
+from mopidy.local import storage
+from mopidy.local.library import LocalLibraryProvider
+from mopidy.local.playback import LocalPlaybackProvider
+from mopidy.local.playlists import LocalPlaylistsProvider
 
-from . import storage
-from .library import LocalLibraryProvider
-from .playback import LocalPlaybackProvider
-from .playlists import LocalPlaylistsProvider
 
 logger = logging.getLogger(__name__)
 

mopidy/local/commands.py

@@ -6,9 +6,9 @@ import time
 
 from mopidy import commands, exceptions
 from mopidy.audio import scan
+from mopidy.local import translator
 from mopidy.utils import path
 
-from . import translator
 
 logger = logging.getLogger(__name__)
 

mopidy/local/playback.py

@@ -3,8 +3,8 @@ from __future__ import unicode_literals
 import logging
 
 from mopidy import backend
+from mopidy.local import translator
 
-from . import translator
 
 logger = logging.getLogger(__name__)
 

mopidy/local/translator.py

@@ -3,13 +3,14 @@ from __future__ import unicode_literals
 import logging
 import os
 import re
-import urlparse
 import urllib
+import urlparse
 
 from mopidy.models import Track
 from mopidy.utils.encoding import locale_decode
 from mopidy.utils.path import path_to_uri, uri_to_path
 
+
 M3U_EXTINF_RE = re.compile(r'#EXTINF:(-1|\d+),(.*)')
 
 logger = logging.getLogger(__name__)

mopidy/utils/deps.py

@@ -6,11 +6,11 @@ import platform
 
 import pygst
 pygst.require('0.10')
-import gst
+import gst  # noqa
 
 import pkg_resources
 
-from . import formatting
+from mopidy.utils import formatting
 
 
 def format_dependency_list(adapters=None):

mopidy/utils/network.py

@@ -1,13 +1,14 @@
 from __future__ import unicode_literals
 
 import errno
-import gobject
 import logging
 import re
 import socket
 import sys
 import threading
 
+import gobject
+
 import pykka
 
 from mopidy.utils import encoding

mopidy/utils/path.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
+import Queue as queue
 import logging
 import os
-import Queue as queue
 import stat
 import string
 import threading

setup.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import re
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 def get_version(filename):

tests/audio/test_actor.py

@@ -2,13 +2,13 @@ from __future__ import unicode_literals
 
 import unittest
 
-import pygst
-pygst.require('0.10')
-import gst
-
 import gobject
 gobject.threads_init()
 
+import pygst
+pygst.require('0.10')
+import gst  # noqa
+
 import pykka
 
 from mopidy import audio

tests/audio/test_listener.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import audio
 
 

tests/audio/test_scan.py

@@ -8,7 +8,7 @@ gobject.threads_init()
 
 from mopidy import exceptions
 from mopidy.audio import scan
-from mopidy.models import Track, Artist, Album
+from mopidy.models import Album, Artist, Track
 from mopidy.utils import path as path_lib
 
 from tests import path_to_data_dir

tests/backend/test_listener.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import backend
 
 

tests/config/test_config.py

@@ -2,9 +2,10 @@
 
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import config
 
 from tests import path_to_data_dir

tests/config/test_schemas.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 import logging
-import mock
 import unittest
 
+import mock
+
 from mopidy.config import schemas, types
 
 from tests import any_unicode

tests/config/test_types.py

@@ -3,10 +3,11 @@
 from __future__ import unicode_literals
 
 import logging
-import mock
 import socket
 import unittest
 
+import mock
+
 from mopidy.config import types
 
 # TODO: DecodeTest and EncodeTest

tests/core/test_actor.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 import pykka
 
 from mopidy.core import Core

tests/core/test_events.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 import pykka
 
 from mopidy import core

tests/core/test_library.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import backend, core
 from mopidy.models import Ref, SearchResult, Track
 

tests/core/test_listener.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy.core import CoreListener, PlaybackState
 from mopidy.models import Playlist, TlTrack
 

tests/core/test_playback.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import backend, core
 from mopidy.models import Track
 

tests/core/test_playlists.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import backend, core
 from mopidy.models import Playlist, Track
 

tests/core/test_tracklist.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy import backend, core
 from mopidy.models import Track
 

tests/http/test_events.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 import json
-import mock
 import unittest
 
+import mock
+
 try:
     import cherrypy
 except ImportError:

tests/local/test_events.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 import unittest
 
 import mock
+
 import pykka
 
 from mopidy import audio, backend, core

tests/local/test_library.py

@@ -9,7 +9,7 @@ import pykka
 
 from mopidy import core
 from mopidy.local import actor, json
-from mopidy.models import Track, Album, Artist
+from mopidy.models import Album, Artist, Track
 
 from tests import path_to_data_dir
 

tests/local/test_playback.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
-import mock
 import time
 import unittest
 
+import mock
+
 import pykka
 
 from mopidy import audio, core

tests/mpd/protocol/__init__.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 import pykka
 
 from mopidy import core

tests/mpd/protocol/test_music_db.py

@@ -2,8 +2,8 @@ from __future__ import unicode_literals
 
 import unittest
 
-from mopidy.mpd.protocol import music_db
 from mopidy.models import Album, Artist, Playlist, Ref, SearchResult, Track
+from mopidy.mpd.protocol import music_db
 
 from tests.mpd import protocol
 

tests/mpd/protocol/test_stored_playlists.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from mopidy.models import Track, Playlist
+from mopidy.models import Playlist, Track
 
 from tests.mpd import protocol
 

tests/mpd/test_exceptions.py

@@ -3,8 +3,8 @@ from __future__ import unicode_literals
 import unittest
 
 from mopidy.mpd.exceptions import (
-    MpdAckError, MpdPermissionError, MpdUnknownCommand, MpdNoCommand,
+    MpdAckError, MpdNoCommand, MpdNotImplemented, MpdPermissionError,
-    MpdSystemError, MpdNotImplemented)
+    MpdSystemError, MpdUnknownCommand)
 
 
 class MpdExceptionsTest(unittest.TestCase):

tests/mpd/test_translator.py

@@ -3,9 +3,9 @@ from __future__ import unicode_literals
 import datetime
 import unittest
 
-from mopidy.utils.path import mtime
+from mopidy.models import Album, Artist, Playlist, TlTrack, Track
 from mopidy.mpd import translator
-from mopidy.models import Album, Artist, TlTrack, Playlist, Track
+from mopidy.utils.path import mtime
 
 
 class TrackMpdFormatTest(unittest.TestCase):

tests/test_commands.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 import argparse
-import mock
 import unittest
 
+import mock
+
 from mopidy import commands
 
 

tests/test_models.py

@@ -4,8 +4,8 @@ import json
 import unittest
 
 from mopidy.models import (
-    Ref, Artist, Album, TlTrack, Track, Playlist, SearchResult,
+    Album, Artist, ModelJSONEncoder, Playlist, Ref, SearchResult, TlTrack,
-    ModelJSONEncoder, model_json_decoder)
+    Track, model_json_decoder)
 
 
 class GenericCopyTest(unittest.TestCase):

tests/test_version.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from distutils.version import StrictVersion as SV
 import unittest
+from distutils.version import StrictVersion as SV
 
 from mopidy import __version__
 

tests/utils/network/test_connection.py

@@ -2,11 +2,13 @@ from __future__ import unicode_literals
 
 import errno
 import logging
-from mock import patch, sentinel, Mock
 import socket
 import unittest
 
 import gobject
+
+from mock import Mock, patch, sentinel
+
 import pykka
 
 from mopidy.utils import network

tests/utils/network/test_lineprotocol.py

@@ -2,10 +2,11 @@
 
 from __future__ import unicode_literals
 
-from mock import sentinel, Mock
 import re
 import unittest
 
+from mock import Mock, sentinel
+
 from mopidy.utils import network
 
 from tests import any_unicode

tests/utils/network/test_server.py

@@ -1,12 +1,13 @@
 from __future__ import unicode_literals
 
 import errno
-from mock import patch, sentinel, Mock
 import socket
 import unittest
 
 import gobject
 
+from mock import Mock, patch, sentinel
+
 from mopidy.utils import network
 
 from tests import any_int

tests/utils/network/test_utils.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
-from mock import patch, Mock
 import socket
 import unittest
 
+from mock import Mock, patch
+
 from mopidy.utils import network
 
 

tests/utils/test_deps.py

@@ -1,12 +1,13 @@
 from __future__ import unicode_literals
 
 import platform
-import mock
 import unittest
 
+import mock
+
 import pygst
 pygst.require('0.10')
-import gst
+import gst  # noqa
 
 import pkg_resources
 

tests/utils/test_encoding.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import mock
 import unittest
 
+import mock
+
 from mopidy.utils.encoding import locale_decode
 
 

tests/utils/test_jsonrpc.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 import json
-import mock
 import unittest
 
+import mock
+
 import pykka
 
 from mopidy import core, models