diff --git a/debian/bin/kconfig.py b/debian/bin/kconfig.py index 815839937..9ee0750d7 100755 --- a/debian/bin/kconfig.py +++ b/debian/bin/kconfig.py @@ -11,10 +11,10 @@ from debian_linux.kconfig import * def merge(output, configs, overrides): kconfig = KconfigFile() for c in configs: - kconfig.read(file(c)) - for key, value in overrides.iteritems(): + kconfig.read(open(c)) + for key, value in overrides.items(): kconfig.set(key, value) - file(output, "w").write(str(kconfig)) + open(output, "w").write(str(kconfig)) def opt_callback_dict(option, opt, value, parser): diff --git a/debian/lib/python/debian_linux/kconfig.py b/debian/lib/python/debian_linux/kconfig.py index e052d5522..67309e3a0 100644 --- a/debian/lib/python/debian_linux/kconfig.py +++ b/debian/lib/python/debian_linux/kconfig.py @@ -87,5 +87,5 @@ class KconfigFile(OrderedDict): self[key] = entry def str_iter(self): - for key, value in self.iteritems(): + for key, value in self.items(): yield str(value)