http: Update to use unicode literals and not cause warnings with flake8

mopidy/frontends/http/actor.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import logging
 import os
 
@@ -31,8 +33,8 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
     def _setup_server(self):
         cherrypy.config.update({
             'engine.autoreload_on': False,
-            'server.socket_host':
-                settings.HTTP_SERVER_HOSTNAME.encode('utf-8'),
+            'server.socket_host': (
+                settings.HTTP_SERVER_HOSTNAME.encode('utf-8')),
             'server.socket_port': settings.HTTP_SERVER_PORT,
         })
 
@@ -49,18 +51,18 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
             static_dir = settings.HTTP_SERVER_STATIC_DIR
         else:
             static_dir = os.path.dirname(__file__)
-        logger.debug(u'HTTP server will serve "%s" at /', static_dir)
+        logger.debug('HTTP server will serve "%s" at /', static_dir)
 
         config = {
-            '/': {
+            b'/': {
                 'tools.staticdir.on': True,
                 'tools.staticdir.index': 'index.html',
                 'tools.staticdir.dir': static_dir,
             },
-            '/api': {
+            b'/api': {
                 'request.dispatch': cherrypy.dispatch.MethodDispatcher(),
             },
-            '/ws': {
+            b'/ws': {
                 'tools.websocket.on': True,
                 'tools.websocket.handler_cls': ws.WebSocketHandler,
             },
@@ -77,17 +79,18 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
         app.log.error_log.setLevel(logging.NOTSET)
 
     def on_start(self):
-        logger.debug(u'Starting HTTP server')
+        logger.debug('Starting HTTP server')
         cherrypy.engine.start()
-        logger.info(u'HTTP server running at %s', cherrypy.server.base())
+        logger.info('HTTP server running at %s', cherrypy.server.base())
 
     def on_stop(self):
-        logger.debug(u'Stopping HTTP server')
+        logger.debug('Stopping HTTP server')
         cherrypy.engine.exit()
-        logger.info(u'Stopped HTTP server')
+        logger.info('Stopped HTTP server')
 
     def playback_state_changed(self, old_state, new_state):
-        cherrypy.engine.publish('websocket-broadcast',
+        cherrypy.engine.publish(
+            'websocket-broadcast',
             TextMessage('playback_state_changed: %s -> %s' % (
                 old_state, new_state)))
 

mopidy/frontends/http/api.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from mopidy import exceptions
 
 try:

mopidy/frontends/http/ws.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import logging
 
 from mopidy import exceptions
@@ -15,23 +17,26 @@ logger = logging.getLogger('mopidy.frontends.http')
 class WebSocketResource(object):
     @cherrypy.expose
     def index(self):
-        logger.debug(u'WebSocket handler created')
+        logger.debug('WebSocket handler created')
 
 
 class WebSocketHandler(WebSocket):
     def opened(self):
         remote = cherrypy.request.remote
-        logger.debug(u'New WebSocket connection from %s:%d',
+        logger.debug(
+            'New WebSocket connection from %s:%d',
             remote.ip, remote.port)
 
     def closed(self, code, reason=None):
         remote = cherrypy.request.remote
-        logger.debug(u'Closed WebSocket connection from %s:%d '
+        logger.debug(
+            'Closed WebSocket connection from %s:%d '
             'with code %s and reason %r',
             remote.ip, remote.port, code, reason)
 
     def received_message(self, message):
         remote = cherrypy.request.remote
-        logger.debug(u'Received WebSocket message from %s:%d: %s',
+        logger.debug(
+            'Received WebSocket message from %s:%d: %s',
             remote.ip, remote.port, message)
         # This is where we would handle incoming messages from the clients

tests/frontends/http/api_test.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import pykka
 
 from tests import unittest
@@ -32,16 +34,16 @@ class ApiResourceTest(unittest.TestCase):
         self.assertIn('resources', result)
 
         self.assertIn('player', result['resources'])
-        self.assertEquals('/api/player/',
-            result['resources']['player']['href'])
+        self.assertEquals(
+            '/api/player/', result['resources']['player']['href'])
 
         self.assertIn('tracklist', result['resources'])
-        self.assertEquals('/api/tracklist/',
-            result['resources']['tracklist']['href'])
+        self.assertEquals(
+            '/api/tracklist/', result['resources']['tracklist']['href'])
 
         self.assertIn('playlists', result['resources'])
-        self.assertEquals('/api/playlists/',
-            result['resources']['playlists']['href'])
+        self.assertEquals(
+            '/api/playlists/', result['resources']['playlists']['href'])
 
     def test_player_get_returns_playback_properties(self):
         result = self.api.player.GET()

tests/frontends/http/ws_test.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from tests import unittest