From 4521f32983a5faa7b283433ee677c013e1d16c3b Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <stanisci.m@gmail.com>
Date: Tue, 5 Dec 2017 21:25:15 +0100
Subject: linting the launcher

---
 taler-merchant-donations.in | 78 +++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/taler-merchant-donations.in b/taler-merchant-donations.in
index 8613d43..631e903 100644
--- a/taler-merchant-donations.in
+++ b/taler-merchant-donations.in
@@ -8,49 +8,47 @@ import argparse
 import sys
 import os
 import site
+import logging
+from talerdonations.talerconfig import TalerConfig
 
 
 os.environ.setdefault("TALER_PREFIX", "@prefix@")
 site.addsitedir("%s/lib/python%d.%d/site-packages" % (
-    "@prefix@", 
+    "@prefix@",
     sys.version_info.major,
     sys.version_info.minor))
 
-from talerdonations.talerconfig import TalerConfig
-import logging
-logger = logging.getLogger(__name__)
+TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
 
 # No perfect match to our logging format, but good enough ...
-uwsgi_logfmt = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
+UWSGI_LOGFMT = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)"
 
 def handle_serve_http(args):
-    tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
     port = args.port
     if port is None:
-        port = tc["donations"]["http_port"].value_int(required=True)
+        port = TC["donations"]["http_port"].value_int(required=True)
     spec = ":%d" % (port,)
     os.execlp("uwsgi", "uwsgi",
-            "--master",
-            "--die-on-term",
-            "--log-format", uwsgi_logfmt,
-            "--http", spec,
-            "--wsgi-file", "@prefix@/share/taler/frontend-donations.wsgi")
-
-def handle_serve_uwsgi(args):
-    tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
-    serve_uwsgi = tc["donations"]["uwsgi_serve"].value_string(required=True).lower()
+              "--master",
+              "--die-on-term",
+              "--log-format", UWSGI_LOGFMT,
+              "--http", spec,
+              "--wsgi-file", "@prefix@/share/taler/frontend-donations.wsgi")
+
+def handle_serve_uwsgi():
+    serve_uwsgi = TC["donations"]["uwsgi_serve"].value_string(required=True).lower()
     params = ["uwsgi", "uwsgi",
-        "--master",
-        "--die-on-term",
-        "--log-format", uwsgi_logfmt,
-        "--wsgi-file", "@prefix@/share/taler/frontend-donations.wsgi"]
+              "--master",
+              "--die-on-term",
+              "--log-format", UWSGI_LOGFMT,
+              "--wsgi-file", "@prefix@/share/taler/frontend-donations.wsgi"]
     if serve_uwsgi == "tcp":
-        port = tc["donations"]["uwsgi_port"].value_int(required=True)
+        port = TC["donations"]["uwsgi_port"].value_int(required=True)
         spec = ":%d" % (port,)
         params.extend(["--socket", spec])
     elif serve_uwsgi == "unix":
-        spec = tc["donations"]["uwsgi_unixpath"].value_filename(required=True)
-        mode = tc["donations"]["uwsgi_unixpath_mode"].value_filename(required=True)
+        spec = TC["donations"]["uwsgi_unixpath"].value_filename(required=True)
+        mode = TC["donations"]["uwsgi_unixpath_mode"].value_filename(required=True)
         params.extend(["--socket", spec])
         params.extend(["--chmod-socket="+mode])
         os.makedirs(os.path.dirname(spec), exist_ok=True)
@@ -59,24 +57,28 @@ def handle_serve_uwsgi(args):
 
 
 
-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)
-sub = parser.add_subparsers()
+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)
+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.set_defaults(func=handle_serve_http)
+P = SUB.add_parser('serve-http', help="Serve over HTTP")
+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")
-p.set_defaults(func=handle_serve_uwsgi)
+P = SUB.add_parser('serve-uwsgi', help="Serve over UWSGI")
+P.set_defaults(func=handle_serve_uwsgi)
 
-args = parser.parse_args()
-if getattr(args, 'func', None) is None:
-    parser.print_help()
+ARGS = PARSER.parse_args()
+if getattr(ARGS, 'func', None) is None:
+    PARSER.print_help()
     sys.exit(1)
 
-if args.config is not None:
-    os.environ["TALER_CONFIG_FILE"] = args.config
+if ARGS.config is not None:
+    os.environ["TALER_CONFIG_FILE"] = ARGS.config
 
-args.func(args)
+ARGS.func(ARGS)
-- 
cgit v1.2.3