X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=xsetbg-wsgi.py;h=aad53eea943228f9ecf29d8499d78d2949edcc13;hb=080d6169f03836330b355e5304e51122d7956c11;hp=c4d580032fe449cd30c49111032a7bb2f78aea44;hpb=829a09494a1675180999fea2f675508e832489c4;p=xsetbg.git

diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py
index c4d5800..aad53ee 100755
--- a/xsetbg-wsgi.py
+++ b/xsetbg-wsgi.py
@@ -1,16 +1,18 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """XSetBg (WSGI version)
 
 """
 
+import sys
 from wsgiref import simple_server
 from wsgiref.handlers import SimpleHandler
 from wsgiref.simple_server import WSGIServer, make_server
-simple_server.ServerHandler = SimpleHandler  # Stop logging to stdout
 
 from xsetbg_conf import xsetbg_conf
 from xsetbg import change as _change
 
+simple_server.ServerHandler = SimpleHandler  # Stop logging to stdout
+
 # get httpd settings from config
 if xsetbg_conf.has_option("httpd", "host"):
     host = xsetbg_conf.get("httpd", "host")
@@ -20,6 +22,8 @@ else:
 if xsetbg_conf.has_option("httpd", "port"):
     port = xsetbg_conf.getint("httpd", "port")
 else:
+    def error(error_str):
+        sys.exit("%s: Error: %s\n" % (sys.argv[0], error_str))
     error("Config must specify a port to listen. Abort.")
 
 
@@ -64,7 +68,7 @@ def app(env, start_response):
 
     try:
         commands[command]()
-    except:
+    except Exception:
         status = '500 Error'
         response_headers = [('Content-type', 'text/plain')]
         start_response(status, response_headers)