[linux] 03/05: debian/bin/kconfig.py: Adjust for compatibility with Python 3

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 3d1b88049740c5bbb6f6fc2f85e9336fff4fd748
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Aug 30 21:34:13 2015 +0100

    debian/bin/kconfig.py: Adjust for compatibility with Python 3
    
    Use open() instead of file().
    Use dict.items() instead of .iteritems().
    Use collections.OrderedDict.items() instead of .iteritems().
---
 debian/bin/kconfig.py                     | 6 +++---
 debian/lib/python/debian_linux/kconfig.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/bin/kconfig.py b/debian/bin/kconfig.py
index 8158399..9ee0750 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 e052d55..67309e3 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git