X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fconfig.py;h=d8c42c4bebd51d676ba552192188714f5348d4af;hb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;hp=0e304c48663982cbc149754f169104effbe2f799;hpb=92949e17161a53bfb4a60099e22b58ad63abce4c;p=tld-builder.git

diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py
index 0e304c4..d8c42c4 100644
--- a/TLD_Builder/config.py
+++ b/TLD_Builder/config.py
@@ -1,10 +1,7 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
 import sys
-if sys.version_info[0] == 2:
-    import ConfigParser
-else:
-    import configparser as ConfigParser
+import configparser as ConfigParser
 import string
 import os
 import syslog
@@ -44,11 +41,11 @@ class Builder_Conf:
         p = ConfigParser.ConfigParser()
         def get(o, d = None, sec=None):
             if p.has_option(sec, o):
-                return string.strip(p.get(sec, o))
+                return p.get(sec, o).strip()
             elif p.has_option(builder, o):
-                return string.strip(p.get(builder, o))
+                return p.get(builder, o).strip()
             elif p.has_option("all", o):
-                return string.strip(p.get("all", o))
+                return p.get("all", o).strip()
             elif d != None:
                 return d
             else:
@@ -62,7 +59,7 @@ class Builder_Conf:
         if p.has_option("all", "syslog"):
             f = p.get("all", "syslog")
             if f != "":
-                if syslog_facilities.has_key(f):
+                if f in syslog_facilities:
                     log.open_syslog("builder", syslog_facilities[f])
                 else:
                     log.panic("no such syslog facility: %s" % f)
@@ -71,8 +68,8 @@ class Builder_Conf:
             builder = get("src_builder", builder)
         self.builder = builder
 
-        self.binary_builders = string.split(get("binary_builders"))
-        self.src_builder = string.strip(get("src_builder", ""))
+        self.binary_builders = get("binary_builders").split()
+        self.src_builder = get("src_builder", "").strip()
         self.max_keep_time = int(get("max_keep_time", 168))*60*60
         self.bot_email = get("bot_email", "")
         self.control_url = get("control_url")
@@ -116,7 +113,7 @@ class Builder_Conf:
 
         f = get("syslog", "")
         if f != "":
-            if syslog_facilities.has_key(f):
+            if f in syslog_facilities:
                 log.open_syslog(self.builder, syslog_facilities[f])
             else:
                 log.panic("no such syslog facility: %s" % f)
@@ -127,11 +124,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