From 26833b4093b87020b3caf001918460073511c0cf Mon Sep 17 00:00:00 2001
From: dz0ny <dz0ny@ubuntu.si>
Date: Mon, 12 May 2014 14:15:11 +0200
Subject: [PATCH] Fix: Import order for whole PR

---
 mopidy/http/__init__.py   |  4 ++--
 mopidy/http/actor.py      | 10 +++++-----
 mopidy/http/handlers.py   |  6 +++---
 tests/http/test_router.py |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mopidy/http/__init__.py b/mopidy/http/__init__.py
index 00f01082..0e2cb439 100644
--- a/mopidy/http/__init__.py
+++ b/mopidy/http/__init__.py
@@ -3,10 +3,10 @@ from __future__ import unicode_literals
 import logging
 import os
 
-from mopidy import __version__, config as config_lib, exceptions, ext
-
 import tornado.web
 
+from mopidy import __version__, config as config_lib, exceptions, ext
+
 
 logger = logging.getLogger(__name__)
 
diff --git a/mopidy/http/actor.py b/mopidy/http/actor.py
index ff8dd508..a0f3b94b 100644
--- a/mopidy/http/actor.py
+++ b/mopidy/http/actor.py
@@ -5,16 +5,16 @@ import logging
 import os
 import threading
 
-from mopidy import models, zeroconf
-from mopidy.core import CoreListener
-from mopidy.http import StaticFileHandler, handlers
-
 import pykka
 
 import tornado.ioloop
 import tornado.web
 import tornado.websocket
 
+from mopidy import models, zeroconf
+from mopidy.core import CoreListener
+from mopidy.http import StaticFileHandler, handlers
+
 
 logger = logging.getLogger(__name__)
 
@@ -65,7 +65,7 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
             list((l[0], l[1]) for l in routes)
         )
 
-        #TODO: Dynamically define all endpoints
+        # TODO: Dynamically define all endpoints
         routes.extend([
             (r"/mopidy/ws/?", handlers.WebSocketHandler, {'actor': self}),
             (r"/mopidy/rpc", handlers.JsonRpcHandler, {'actor': self}),
diff --git a/mopidy/http/handlers.py b/mopidy/http/handlers.py
index 1a9976ac..bbfa75fa 100644
--- a/mopidy/http/handlers.py
+++ b/mopidy/http/handlers.py
@@ -2,13 +2,13 @@ from __future__ import unicode_literals
 
 import logging
 
-from mopidy import __version__, core, models
-from mopidy.utils import jsonrpc
-
 import tornado.escape
 import tornado.web
 import tornado.websocket
 
+from mopidy import __version__, core, models
+from mopidy.utils import jsonrpc
+
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/http/test_router.py b/tests/http/test_router.py
index 6fd477ff..7910c6bb 100644
--- a/tests/http/test_router.py
+++ b/tests/http/test_router.py
@@ -5,12 +5,12 @@ import unittest
 
 import mock
 
-from mopidy import __version__, http
-
 from tornado.escape import to_unicode
 from tornado.testing import AsyncHTTPTestCase
 from tornado.web import Application
 
+from mopidy import __version__, http
+
 
 try:
     import tornado