X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fconfig.py;h=3bede1b8718b0e7276512fe3654ee4bfd7cf736b;hb=0649d8115817785eb4b35ac0f725406d19cef175;hp=2e86325f014ef6454a5a848694443fd20b9e52bb;hpb=51ef5d71032ce137b14665b925c75e788471ca5f;p=tld-builder.git

diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py
index 2e86325..3bede1b 100644
--- 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
@@ -69,7 +73,6 @@ 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")
@@ -124,11 +127,11 @@ config = Builder_Conf()
 
 def init_conf(builder=None):
     try:
-	_create_unverified_https_context = ssl._create_unverified_context
+        _create_unverified_https_context = ssl._create_unverified_context
     except AttributeError:
-	pass
+        pass
     else:
-	ssl._create_default_https_context = _create_unverified_https_context
+        ssl._create_default_https_context = _create_unverified_https_context
     os.environ['LC_ALL'] = "C"
     status.push("reading builder config")
     log.builder = builder