From 4331e6bbf8227d852a161c1366a53a2ff3299a6d Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Thu, 6 Feb 2020 10:44:49 +1300 Subject: [PATCH] Black take two; Moving excludes into setup.cfg --- .coverage | Bin 53248 -> 53248 bytes mopidy_iris/core.py | 16 ++++++---------- mopidy_iris/handlers.py | 33 ++++++++++----------------------- setup.cfg | 31 ++++++++++++++++++++++++++++++- tox.ini | 2 +- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/.coverage b/.coverage index b02a1c61c5d3603638f66cad5da2b4e03377d2ad..206ed31aae03645d8de515335f818891db5b5e96 100644 GIT binary patch delta 534 zcmX|5Pfrs;6n`^sX0vNe-_jTrmzI$j385*qz@-Uvl4{CD){A%`+CWg^MH8Bkc%g*6+jv}B9dO~v) z4JX1JrGF}>yliTZ>PyvnZHXjCclKZJb>6;zw_K@K7JIWo75mN3hfaHIZ+CxlHhsRZ zKK#1yEF@|GeWMflL_OM~2HVY(HXcGNJzp>Cl16BzPvb~WDTGGajVE=42rFqRzN?MQ zc*k*38#l2xo_mcHAy0 zgRNkA)}Aqx9|2v`FZw|(TFj5w?svXh^OOkQcvmk94*(SWM`F3X=|6Uh@!q(>lLgJ1 zhkEs+{%iq6ww1lxN{gUhR#&6VpBM8=Djy7lAbtJ~GYUY~GT$(rtDn8yzoCxcgGwL) z%Q|57Kk#J7J>QX~g}mZhZNkN+b9JyRcL>K>oa}qZ*XHp?Ai3U>tCMSmoKQhIRkAh$+;-y;Snk?xW)0Au}?E!%Y@$vW?gD{_n5F zPgm38kbnc%Koy5k#@rXJ5oyh4t*Pux?%qu94p25Syyn#czq*{WC+%$WvBF2!(?LDR zyS38V^PBQnfYmkXm5uHJqrLo?1)vl70|zhhh+Z{MXnJ#qsfzJ#f*t+( zy!FM@O^bx&A<^|y5kg|!1Wja3+#3j3_{7#>?1mdMcnpSE{x5`4440MMn;{-KBFH;y oie+M<7;9IPga*Y=9ikso<3?KHhH-g8S)^#4!Zr;eZR6jAW3|BncK`qY diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py index 3b6b55d4..fe4d3ce8 100755 --- a/mopidy_iris/core.py +++ b/mopidy_iris/core.py @@ -811,9 +811,7 @@ class IrisCore(pykka.ThreadingActor): self.broadcast( data={ "method": "queue_metadata_changed", - "params": { - "queue_metadata": self.queue_metadata - }, + "params": {"queue_metadata": self.queue_metadata}, } ) @@ -865,9 +863,7 @@ class IrisCore(pykka.ThreadingActor): self.broadcast( data={ "method": "commands_changed", - "params": { - "commands": self.commands - }, + "params": {"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": { - "spotify_token": self.spotify_token - }, + "params": {"spotify_token": self.spotify_token}, } ) diff --git a/mopidy_iris/handlers.py b/mopidy_iris/handlers.py index 4a619b4d..84f27911 100755 --- a/mopidy_iris/handlers.py +++ b/mopidy_iris/handlers.py @@ -101,13 +101,10 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler): ), ) else: - getattr( - iris, - message["method"])( + getattr(iris, message["method"])( ioloop=self.ioloop, data=params, - callback=lambda response, - error=False: self.handle_result( + callback=lambda response, error=False: self.handle_result( id=id, method=message["method"], response=response, @@ -214,17 +211,12 @@ class HttpHandler(tornado.web.RequestHandler): ), ) else: - getattr( - iris, - slug)( + getattr(iris, slug)( ioloop=self.ioloop, request=self, - callback=lambda response, - error=False: self.handle_result( - id=id, - method=slug, - response=response, - error=error), + callback=lambda response, error=False: self.handle_result( + 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( - iris, - slug)( + getattr(iris, slug)( data=params, request=self.request, - callback=lambda response=False, - error=False: self.handle_result( - id=id, - method=slug, - response=response, - error=error), + callback=lambda response=False, error=False: self.handle_result( + id=id, method=slug, response=response, error=error + ), ) except tornado.web.HTTPError: diff --git a/setup.cfg b/setup.cfg index b0716125..e1e52069 100755 --- a/setup.cfg +++ b/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 \ No newline at end of file diff --git a/tox.ini b/tox.ini index eda38c80..0652ae21 100755 --- a/tox.ini +++ b/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 \ No newline at end of file