diff --git a/base/kcconf.py b/base/kcconf.py index 5f313a8..82f3970 100644 --- a/base/kcconf.py +++ b/base/kcconf.py @@ -6,14 +6,14 @@ import os import os.path def configkopano(configs): - for filename, config in configs.iteritems(): + for filename, config in configs.items(): if not os.path.exists(filename): return with open(filename) as f: contents = f.read() f.close() - for key, newvalue in config.iteritems(): + for key, newvalue in config.items(): contents = re.sub(r"^\s*#?\s*{}\s*=.*".format(key), r"{} = {}".format(key, newvalue), contents, 0, re.MULTILINE) with open(filename, "w") as f: @@ -22,7 +22,7 @@ def configkopano(configs): def parseenvironmentvariables(prependingpath): configs = dict() - for name, value in os.environ.iteritems(): + for name, value in os.environ.items(): namematch = re.match(r"^KCCONF_([A-Z]+)_([A-Z0-9_]+)$", name) if namematch != None: filename = namematch.group(1).lower() + ".cfg"