From 141e949fa9f09e5f54acdfa90f609895236a8ac0 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 29 Aug 2019 23:08:26 +0200
Subject: make pretty

---
 bin/taler-merchant-survey | 48 +++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to 'bin/taler-merchant-survey')

diff --git a/bin/taler-merchant-survey b/bin/taler-merchant-survey
index 418cd78..2da6fde 100755
--- a/bin/taler-merchant-survey
+++ b/bin/taler-merchant-survey
@@ -28,7 +28,6 @@ import site
 import logging
 from talersurvey.talerconfig import TalerConfig
 
-
 LOGGER = logging.getLogger(__name__)
 # No perfect match to our logging format, but good enough ...
 UWSGI_LOGFMT = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
@@ -43,13 +42,11 @@ def handle_serve_http(args):
     port = args.port
     if port is None:
         port = TC["survey"]["http_port"].value_int(required=True)
-    spec = ":%d" % (port,)
-    os.execlp("uwsgi", "uwsgi",
-              "--master",
-              "--die-on-term",
-              "--log-format", UWSGI_LOGFMT,
-              "--http", spec,
-              "--module", "talersurvey")
+    spec = ":%d" % (port, )
+    os.execlp(
+        "uwsgi", "uwsgi", "--master", "--die-on-term", "--log-format",
+        UWSGI_LOGFMT, "--http", spec, "--module", "talersurvey"
+    )
 
 
 ##
@@ -60,22 +57,22 @@ def handle_serve_http(args):
 #
 # @param command line options.
 def handle_serve_uwsgi(args):
-    del args # pacify PEP checkers
-    serve_uwsgi = TC["survey"]["uwsgi_serve"].value_string(required=True).lower()
-    params = ["uwsgi", "uwsgi",
-              "--master",
-              "--die-on-term",
-              "--log-format", UWSGI_LOGFMT,
-              "--module", "talersurvey"]
+    del args  # pacify PEP checkers
+    serve_uwsgi = TC["survey"]["uwsgi_serve"].value_string(required=True
+                                                           ).lower()
+    params = [
+        "uwsgi", "uwsgi", "--master", "--die-on-term", "--log-format",
+        UWSGI_LOGFMT, "--module", "talersurvey"
+    ]
     if serve_uwsgi == "tcp":
         port = TC["survey"]["uwsgi_port"].value_int(required=True)
-        spec = ":%d" % (port,)
+        spec = ":%d" % (port, )
         params.extend(["--socket", spec])
     elif serve_uwsgi == "unix":
         spec = TC["survey"]["uwsgi_unixpath"].value_filename(required=True)
         mode = TC["survey"]["uwsgi_unixpath_mode"].value_filename(required=True)
         params.extend(["--socket", spec])
-        params.extend(["--chmod-socket="+mode])
+        params.extend(["--chmod-socket=" + mode])
         os.makedirs(os.path.dirname(spec), exist_ok=True)
     logging.info("launching uwsgi with argv %s", params[1:])
     os.execlp(*params)
@@ -84,14 +81,21 @@ def handle_serve_uwsgi(args):
 ## @cond
 PARSER = argparse.ArgumentParser()
 PARSER.set_defaults(func=None)
-PARSER.add_argument('--config', '-c',
-                    help="configuration file to use",
-                    metavar="CONFIG", type=str,
-                    dest="config", default=None)
+PARSER.add_argument(
+    '--config',
+    '-c',
+    help="configuration file to use",
+    metavar="CONFIG",
+    type=str,
+    dest="config",
+    default=None
+)
 SUB = PARSER.add_subparsers()
 
 P = SUB.add_parser('serve-http', help="Serve over HTTP")
-P.add_argument("--port", "-p", dest="port", type=int, default=None, metavar="PORT")
+P.add_argument(
+    "--port", "-p", dest="port", type=int, default=None, metavar="PORT"
+)
 P.set_defaults(func=handle_serve_http)
 
 P = SUB.add_parser('serve-uwsgi', help="Serve over UWSGI")
-- 
cgit v1.2.3