- indentation fix

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

diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py
index 5e3bd9e106786427e97623bebedba60646ce9384..3bede1b8718b0e7276512fe3654ee4bfd7cf736b 100644 (file)
--- a/TLD_Builder/config.py
+++ b/TLD_Builder/config.py
@@ -1,6 +1,10 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
-import ConfigParser
+import sys
+if sys.version_info[0] == 2:
+    import ConfigParser
+else:
+    import configparser as ConfigParser
 import string
 import os
 import syslog
@@ -9,6 +13,7 @@ import path
 import log
 import status
 
+import ssl
 
 syslog_facilities = {
     'kern': syslog.LOG_KERN,
@@ -68,14 +73,13 @@ class Builder_Conf:
 
         self.binary_builders = string.split(get("binary_builders"))
         self.src_builder = string.strip(get("src_builder", ""))
-        self.tag_prefixes = string.split(get("tag_prefixes", ""))
         self.max_keep_time = int(get("max_keep_time", 168))*60*60
         self.bot_email = get("bot_email", "")
         self.control_url = get("control_url")
-        self.request_handler_server_port = int(get("port", d=1234, sec="request-server"))
+        self.request_handler_server_port = int(get("port", d=1231, sec="request-server"))
         self.request_handler_server_ssl = get("ssl", d="False", sec="request-server")
         if self.request_handler_server_ssl:
-            self.request_handler_server_ssl_port = int(get("port", d=1235, sec="request-server"))
+            self.request_handler_server_ssl_port = int(get("ssl_port", d=1241, sec="request-server"))
             self.request_handler_server_ssl_key = get("ssl_key", d="", sec="request-server")
             self.request_handler_server_ssl_cert = get("ssl_cert", d="", sec="request-server")
         self.builder_list = get("builder_list", "")
@@ -122,6 +126,12 @@ class Builder_Conf:
 config = Builder_Conf()
 
 def init_conf(builder=None):
+    try:
+        _create_unverified_https_context = ssl._create_unverified_context
+    except AttributeError:
+        pass
+    else:
+        ssl._create_default_https_context = _create_unverified_https_context
     os.environ['LC_ALL'] = "C"
     status.push("reading builder config")
     log.builder = builder