Black take two; Moving excludes into setup.cfg

mopidy_iris/core.py

@@ -811,9 +811,7 @@ class IrisCore(pykka.ThreadingActor):
         self.broadcast(
             data={
                 "method": "queue_metadata_changed",
-                "params": {
+                "params": {"queue_metadata": self.queue_metadata},
-                    "queue_metadata": self.queue_metadata
-                },
             }
         )
 
@@ -865,9 +863,7 @@ class IrisCore(pykka.ThreadingActor):
         self.broadcast(
             data={
                 "method": "commands_changed",
-                "params": {
+                "params": {"commands": self.commands},
-                    "commands": self.commands
-                },
             }
         )
 
@@ -886,7 +882,9 @@ class IrisCore(pykka.ThreadingActor):
             error = {
                 "message": "Command failed",
                 "description": "Could not find command by ID "
-                + '"' + str(data["id"]) + '"',
+                + '"'
+                + str(data["id"])
+                + '"',
             }
         else:
             command = self.commands[str(data["id"])]
@@ -1030,9 +1028,7 @@ class IrisCore(pykka.ThreadingActor):
             self.broadcast(
                 data={
                     "method": "spotify_token_changed",
-                    "params": {
+                    "params": {"spotify_token": self.spotify_token},
-                        "spotify_token": self.spotify_token
-                    },
                 }
             )
 

mopidy_iris/handlers.py

@@ -101,13 +101,10 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
                             ),
                         )
                     else:
-                        getattr(
+                        getattr(iris, message["method"])(
-                            iris,
-                            message["method"])(
                             ioloop=self.ioloop,
                             data=params,
-                            callback=lambda response,
+                            callback=lambda response, error=False: self.handle_result(
-                            error=False: self.handle_result(
                                 id=id,
                                 method=message["method"],
                                 response=response,
@@ -214,17 +211,12 @@ class HttpHandler(tornado.web.RequestHandler):
                         ),
                     )
                 else:
-                    getattr(
+                    getattr(iris, slug)(
-                        iris,
-                        slug)(
                         ioloop=self.ioloop,
                         request=self,
-                        callback=lambda response,
+                        callback=lambda response, error=False: self.handle_result(
-                        error=False: self.handle_result(
+                            id=id, method=slug, response=response, error=error
-                            id=id,
+                        ),
-                            method=slug,
-                            response=response,
-                            error=error),
                     )
             except Exception as e:
                 logger.error(str(e))
@@ -264,17 +256,12 @@ class HttpHandler(tornado.web.RequestHandler):
                         ),
                     )
                 else:
-                    getattr(
+                    getattr(iris, slug)(
-                        iris,
-                        slug)(
                         data=params,
                         request=self.request,
-                        callback=lambda response=False,
+                        callback=lambda response=False, error=False: self.handle_result(
-                        error=False: self.handle_result(
+                            id=id, method=slug, response=response, error=error
-                            id=id,
+                        ),
-                            method=slug,
-                            response=response,
-                            error=error),
                     )
 
             except tornado.web.HTTPError:

setup.cfg

@@ -64,7 +64,6 @@ mopidy.ext =
 [flake8]
 application-import-names = mopidy_iris, tests
 max-line-length = 80
-exclude = .git, .tox, build
 select =
     # Regular flake8 rules
     C, E, F, W
@@ -83,3 +82,33 @@ ignore =
     W503
     # B305: .next() is not a thing on Python 3 (used by playback controller)
     B305
+exclude =
+    .circleci,
+    .git,
+    .tox,
+    .vscode,
+    docs,
+    tests,
+    src,
+    node_modules,
+    build_tools,
+    docker,
+    Screenshots
+
+[check-manifest]
+ignore =
+    build_tools
+    build_tools/*
+    docker
+    docker/*
+    Screenshots
+    Screenshots/*
+    src
+    src/*
+    .circleci
+    .circleci/*
+    .dockerignore
+    .htaccess
+    .vscode
+    .vscode/*
+    .dockerignore

tox.ini

@@ -36,4 +36,4 @@ ignore =
 
 [testenv:flake8]
 deps = .[lint]
-commands = python -m flake8 --show-source --statistics
+commands = python -m flake8 --show-source --statistics