From 031c7c8e939ad2e17ca698a86095a6a7d75485e7 Mon Sep 17 00:00:00 2001
From: dz0ny <dz0ny@ubuntu.si>
Date: Mon, 12 May 2014 16:16:08 +0200
Subject: [PATCH] Add: Tornado as required dependency Fix: Remove draft76 Fix:
 Remove class attributes for ws handler Revert: default to /ws/ for for
 mopidy.html

---
 docs/api/http.rst            | 2 +-
 mopidy/http/actor.py         | 2 +-
 mopidy/http/data/mopidy.html | 2 +-
 mopidy/http/handlers.py      | 3 ---
 setup.py                     | 6 ++----
 tests/http/test_events.py    | 1 -
 tests/http/test_router.py    | 1 -
 7 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/docs/api/http.rst b/docs/api/http.rst
index e72d72b6..5561955d 100644
--- a/docs/api/http.rst
+++ b/docs/api/http.rst
@@ -27,7 +27,7 @@ Node.js.
 WebSocket API
 =============
 
-The web server exposes a WebSocket at ``/mopidy/ws``. The WebSocket gives you
+The web server exposes a WebSocket at ``/mopidy/ws/``. The WebSocket gives you
 access to Mopidy's full API and enables Mopidy to instantly push events to the
 client, as they happen.
 
diff --git a/mopidy/http/actor.py b/mopidy/http/actor.py
index a0f3b94b..707ee161 100644
--- a/mopidy/http/actor.py
+++ b/mopidy/http/actor.py
@@ -40,7 +40,7 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
             extension = extension(self.config)
             if callable(getattr(extension, "setup_routes", None)):
                 routes.extend(extension.setup_routes())
-                logger.info('Loaded HTTP router: %s',
+                logger.info('Loaded HTTP extension: %s',
                             extension.__class__.__name__)
             else:
                 logger.info(
diff --git a/mopidy/http/data/mopidy.html b/mopidy/http/data/mopidy.html
index 4f859304..38ea2036 100644
--- a/mopidy/http/data/mopidy.html
+++ b/mopidy/http/data/mopidy.html
@@ -40,7 +40,7 @@
     </div>
     <script src="mopidy.js" type="text/javascript"></script>
     <script type="text/javascript">
-      var ws = new WebSocket("ws://" + document.location.host + "/mopidy/ws");
+      var ws = new WebSocket("ws://" + document.location.host + "/mopidy/ws/");
       ws.onmessage = function (message) {
         var console = document.getElementById('ws-console');
         var newLine = (new Date()).toLocaleTimeString() + ": " +
diff --git a/mopidy/http/handlers.py b/mopidy/http/handlers.py
index bbfa75fa..5ec9cffd 100644
--- a/mopidy/http/handlers.py
+++ b/mopidy/http/handlers.py
@@ -39,9 +39,6 @@ def construct_rpc(actor):
 
 
 class WebSocketHandler(tornado.websocket.WebSocketHandler):
-    actor = None
-    jsonrpc = None
-
     def initialize(self, actor):
         self.actor = actor
         self.jsonrpc = construct_rpc(actor)
diff --git a/setup.py b/setup.py
index 727041b7..0388898f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,11 +25,9 @@ setup(
     include_package_data=True,
     install_requires=[
         'setuptools',
-        'Pykka >= 1.1', 'tornado',
+        'Pykka >= 1.1',
+        'tornado >= 3.1.1',
     ],
-    extras_require={
-        'http': ['tornado >= 3.1.1'],
-    },
     test_suite='nose.collector',
     tests_require=[
         'nose',
diff --git a/tests/http/test_events.py b/tests/http/test_events.py
index 682d89b4..fae8aa85 100644
--- a/tests/http/test_events.py
+++ b/tests/http/test_events.py
@@ -24,7 +24,6 @@ class HttpEventsTest(unittest.TestCase):
                 'hostname': '127.0.0.1',
                 'port': 6680,
                 'static_dir': None,
-                'allow_draft76': True,
                 'zeroconf': '',
             }
         }
diff --git a/tests/http/test_router.py b/tests/http/test_router.py
index 44da9be8..9c73cf15 100644
--- a/tests/http/test_router.py
+++ b/tests/http/test_router.py
@@ -42,7 +42,6 @@ class HttpRouterTest(unittest.TestCase):
                 'hostname': '127.0.0.1',
                 'port': 6680,
                 'static_dir': None,
-                'allow_draft76': True,
                 'zeroconf': '',
             }
         }