From 58a8db330e9d46e60e98776721708b03f2ab0579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20K=C3=A1rolyi?= Date: Wed, 24 Oct 2018 20:09:09 +0200 Subject: [PATCH] Blacking code --- daphne/cli.py | 15 ++++++++------- tests/test_cli.py | 27 +++++++++------------------ 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/daphne/cli.py b/daphne/cli.py index adea81a..dc715a6 100755 --- a/daphne/cli.py +++ b/daphne/cli.py @@ -132,7 +132,7 @@ class CommandLineInterface(object): dest="proxy_headers_host", help="Specify which header will be used for getting the host " "part. Can be omitted, requires --proxy-headers to be specified " - "when passed. \"X-Real-IP\" (when passed by your webserver) is a " + 'when passed. "X-Real-IP" (when passed by your webserver) is a ' "good candidate for this.", default=False, action="store", @@ -166,7 +166,8 @@ class CommandLineInterface(object): return raise ArgumentError( argument=argument, - message="--proxy-headers has to be passed for this parameter.") + message="--proxy-headers has to be passed for this parameter.", + ) def _get_forwarded_host(self, args: Namespace): """ @@ -174,8 +175,7 @@ class CommandLineInterface(object): will be extracted. """ if args.proxy_headers_host: - self._check_proxy_headers_passed( - argument=self.arg_proxy_host, args=args) + self._check_proxy_headers_passed(argument=self.arg_proxy_host, args=args) return args.proxy_headers_host if args.proxy_headers: return "X-Forwarded-For" @@ -186,8 +186,7 @@ class CommandLineInterface(object): will be extracted. """ if args.proxy_headers_port: - self._check_proxy_headers_passed( - argument=self.arg_proxy_port, args=args) + self._check_proxy_headers_passed(argument=self.arg_proxy_port, args=args) return args.proxy_headers_port if args.proxy_headers: return "X-Forwarded-Port" @@ -265,6 +264,8 @@ class CommandLineInterface(object): verbosity=args.verbosity, proxy_forwarded_address_header=self._get_forwarded_host(args=args), proxy_forwarded_port_header=self._get_forwarded_port(args=args), - proxy_forwarded_proto_header="X-Forwarded-Proto" if args.proxy_headers else None, + proxy_forwarded_proto_header="X-Forwarded-Proto" + if args.proxy_headers + else None, ) self.server.run() diff --git a/tests/test_cli.py b/tests/test_cli.py index 82f062d..2bbcc42 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -200,10 +200,7 @@ class TestCLIInterface(TestCase): `X-Forwarded-For` header. """ self.assertCLI( - ["--proxy-headers"], - { - "proxy_forwarded_address_header": "X-Forwarded-For", - }, + ["--proxy-headers"], {"proxy_forwarded_address_header": "X-Forwarded-For"} ) def test_custom_proxyhost(self): @@ -213,21 +210,18 @@ class TestCLIInterface(TestCase): """ self.assertCLI( ["--proxy-headers", "--proxy-headers-host", "blah"], - { - "proxy_forwarded_address_header": "blah", - }, + {"proxy_forwarded_address_header": "blah"}, ) with self.assertRaises(expected_exception=ArgumentError) as exc: self.assertCLI( ["--proxy-headers-host", "blah"], - { - "proxy_forwarded_address_header": "blah", - }, + {"proxy_forwarded_address_header": "blah"}, ) self.assertEqual(exc.exception.argument_name, "--proxy-headers-host") self.assertEqual( exc.exception.message, - "--proxy-headers has to be passed for this parameter.") + "--proxy-headers has to be passed for this parameter.", + ) def test_custom_proxyport(self): """ @@ -236,18 +230,15 @@ class TestCLIInterface(TestCase): """ self.assertCLI( ["--proxy-headers", "--proxy-headers-port", "blah2"], - { - "proxy_forwarded_port_header": "blah2", - }, + {"proxy_forwarded_port_header": "blah2"}, ) with self.assertRaises(expected_exception=ArgumentError) as exc: self.assertCLI( ["--proxy-headers-port", "blah2"], - { - "proxy_forwarded_address_header": "blah2", - }, + {"proxy_forwarded_address_header": "blah2"}, ) self.assertEqual(exc.exception.argument_name, "--proxy-headers-port") self.assertEqual( exc.exception.message, - "--proxy-headers has to be passed for this parameter.") + "--proxy-headers has to be passed for this parameter.", + )