- merged PLD changes, now it works with python 3.x

[tld-builder.git] / TLD_Builder / request_handler_server.py

diff --git a/TLD_Builder/request_handler_server.py b/TLD_Builder/request_handler_server.py
index ece2f962521b79eea3b3951609356792ab7cc67a..5ffa1aa7ca8069c36a6b2d797132efe8d4d9f132 100644 (file)
--- a/TLD_Builder/request_handler_server.py
+++ b/TLD_Builder/request_handler_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import socket
 import string
@@ -44,7 +44,7 @@ class MyHandler(BaseHTTPRequestHandler):
             self.send_response(200)
             self.end_headers()
 
-        except Exception, e:
+        except Exception as e:
             self.send_error(500, "%s: %s" % (filename, e))
             self.end_headers()
             log.error("request_handler_server: [%s]: exception: %s\n%s" % (self.client_address[0], e, traceback.format_exc()))
@@ -96,11 +96,11 @@ def main(srv_ssl=False):
             server = HTTPServer((host, port), MyHandler)
             if srv_ssl:
                 server.socket = ssl.wrap_socket (server.socket,
-                                keyfile = config.request_handler_server_ssl_key,
-                                certfile = config.request_handler_server_ssl_cert,
+                                keyfile = path.conf_dir + "/" + config.request_handler_server_ssl_key,
+                                certfile = path.conf_dir + "/" + config.request_handler_server_ssl_cert,
                                 ca_certs = "/etc/certs/ca-certificates.crt",
                                 server_side=True)
-        except Exception, e:
+        except Exception as e:
             log.notice("request_handler_server: can't start server on [%s:%d], ssl=%s: %s" % (host, port, str(srv_ssl), e))
             print >> sys.stderr, "ERROR: Can't start server on [%s:%d], ssl=%s: %s" % (host, port, str(srv_ssl), e)
             sys.exit(1)