- python 3.x fixes

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

diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py
index 3bede1b8718b0e7276512fe3654ee4bfd7cf736b..11ea547a764d038ce70d7e46ef1c9a2f401adfd8 100644 (file)
--- a/TLD_Builder/config.py
+++ b/TLD_Builder/config.py
@@ -44,11 +44,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 +62,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 +71,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 +116,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)