From: Pierce Lopez Date: Sun, 31 Dec 2017 18:44:42 +0000 (-0500) Subject: style fix: closing bracket indent X-Git-Tag: v5.0.0~20^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48e042f2af444322e6a4167087c582718afa9c6b;p=thirdparty%2Ftornado.git style fix: closing bracket indent E123 closing bracket does not match indentation of opening bracket's line --- diff --git a/demos/benchmark/stack_context_benchmark.py b/demos/benchmark/stack_context_benchmark.py index 43d003c29..158f06520 100755 --- a/demos/benchmark/stack_context_benchmark.py +++ b/demos/benchmark/stack_context_benchmark.py @@ -66,7 +66,7 @@ def main(): 'ExceptionBenchmark().call_wrapped(50)', 'ExceptionBenchmark().enter_exit(500)', 'ExceptionBenchmark().call_wrapped(500)', - ] + ] for cmd in cmds: print(cmd) subprocess.check_call(base_cmd + [cmd]) diff --git a/demos/chat/chatdemo.py b/demos/chat/chatdemo.py index b4978bbd9..89149c420 100755 --- a/demos/chat/chatdemo.py +++ b/demos/chat/chatdemo.py @@ -117,13 +117,13 @@ def main(): (r"/", MainHandler), (r"/a/message/new", MessageNewHandler), (r"/a/message/updates", MessageUpdatesHandler), - ], + ], cookie_secret="__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__", template_path=os.path.join(os.path.dirname(__file__), "templates"), static_path=os.path.join(os.path.dirname(__file__), "static"), xsrf_cookies=True, debug=options.debug, - ) + ) app.listen(options.port) tornado.ioloop.IOLoop.current().start() diff --git a/demos/websocket/chatdemo.py b/demos/websocket/chatdemo.py index 5642f1fd0..36b0ed06d 100755 --- a/demos/websocket/chatdemo.py +++ b/demos/websocket/chatdemo.py @@ -87,7 +87,7 @@ class ChatSocketHandler(tornado.websocket.WebSocketHandler): chat = { "id": str(uuid.uuid4()), "body": parsed["body"], - } + } chat["html"] = tornado.escape.to_basestring( self.render_string("message.html", message=chat)) diff --git a/docs/conf.py b/docs/conf.py index 8b7cdf626..54eb65fb1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ extensions = [ "sphinx.ext.doctest", "sphinx.ext.intersphinx", "sphinx.ext.viewcode", - ] +] primary_domain = 'py' default_role = 'py:obj' @@ -36,7 +36,7 @@ coverage_ignore_modules = [ "tornado.platform.asyncio", "tornado.platform.caresresolver", "tornado.platform.twisted", - ] +] # I wish this could go in a per-module file... coverage_ignore_classes = [ # tornado.gen @@ -56,7 +56,7 @@ coverage_ignore_classes = [ "WebSocketProtocol", "WebSocketProtocol13", "WebSocketProtocol76", - ] +] coverage_ignore_functions = [ # various modules @@ -76,11 +76,11 @@ html_favicon = 'favicon.ico' latex_documents = [ ('index', 'tornado.tex', 'Tornado Documentation', 'The Tornado Authors', 'manual', False), - ] +] intersphinx_mapping = { 'python': ('https://docs.python.org/3.6/', None), - } +} on_rtd = os.environ.get('READTHEDOCS', None) == 'True' diff --git a/maint/scripts/test_resolvers.py b/maint/scripts/test_resolvers.py index 7a1ad358f..971395ba0 100644 --- a/maint/scripts/test_resolvers.py +++ b/maint/scripts/test_resolvers.py @@ -44,7 +44,7 @@ def main(): 'unspec': socket.AF_UNSPEC, 'inet': socket.AF_INET, 'inet6': socket.AF_INET6, - }[options.family] + }[options.family] for host in args: print('Resolving %s' % host) diff --git a/maint/test/redbot/red_test.py b/maint/test/redbot/red_test.py index 7dd08b7cc..e0c6459f0 100644 --- a/maint/test/redbot/red_test.py +++ b/maint/test/redbot/red_test.py @@ -49,7 +49,7 @@ class TestMixin(object): ('/post', PostHandler), ('/chunked', ChunkedHandler), ('/cache/(.*)', CacheHandler), - ] + ] def get_app_kwargs(self): return dict(static_path='.') @@ -62,7 +62,7 @@ class TestMixin(object): # For our small test responses the Content-Encoding header # wipes out any gains from compression rs.CONNEG_GZIP_BAD, - ] + ] def get_allowed_errors(self): return [] @@ -245,7 +245,7 @@ class GzipHTTPTest(AsyncHTTPTestCase, TestMixin): # it doesn't seem likely to cause any problems as long as we're # using the correct Vary header. rs.VARY_ETAG_DOESNT_CHANGE, - ] + ] if __name__ == '__main__': parse_command_line() diff --git a/maint/test/websocket/server.py b/maint/test/websocket/server.py index 602cc506d..40b5eeaba 100644 --- a/maint/test/websocket/server.py +++ b/maint/test/websocket/server.py @@ -18,6 +18,6 @@ if __name__ == '__main__': parse_command_line() app = Application([ ('/', EchoHandler), - ]) + ]) app.listen(options.port, address='127.0.0.1') IOLoop.instance().start() diff --git a/maint/vm/windows/bootstrap.py b/maint/vm/windows/bootstrap.py index c69dc2864..d481d034d 100644 --- a/maint/vm/windows/bootstrap.py +++ b/maint/vm/windows/bootstrap.py @@ -30,7 +30,7 @@ TMPDIR = r'c:\tornado_bootstrap' PYTHON_VERSIONS = [ (r'c:\python27\python.exe', 'http://www.python.org/ftp/python/2.7.3/python-2.7.3.msi'), (r'c:\python36\python.exe', 'http://www.python.org/ftp/python/3.6.0/python-3.6.0.msi'), - ] +] SCRIPTS_DIR = r'c:\python27\scripts' EASY_INSTALL = os.path.join(SCRIPTS_DIR, 'easy_install.exe') diff --git a/setup.py b/setup.py index 33e652280..f9254d931 100644 --- a/setup.py +++ b/setup.py @@ -171,8 +171,8 @@ setup( "templates/utf8.html", "test.crt", "test.key", - ], - }, + ], + }, author="Facebook", author_email="python-tornado@googlegroups.com", url="http://www.tornadoweb.org/", @@ -188,6 +188,6 @@ setup( 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', - ], + ], **kwargs ) diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py index ade6a379b..d5cbebd00 100644 --- a/tornado/test/ioloop_test.py +++ b/tornado/test/ioloop_test.py @@ -640,7 +640,7 @@ class TestIOLoopFutures(AsyncTestCase): res = yield [ namespace["async_wrapper"](event1, event2), namespace["async_wrapper"](event2, event1) - ] + ] self.assertEqual([event1, event2], res) diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py index 1a0ac8fb8..974210b00 100644 --- a/tornado/test/options_test.py +++ b/tornado/test/options_test.py @@ -240,7 +240,7 @@ class OptionsTest(unittest.TestCase): ('foo_bar', 'foo_bar'), ('foo-bar', 'foo_bar'), ('foo_bar', 'foo-bar'), - ] + ] for a, b in tests: with subTest(self, a=a, b=b): options = OptionParser()