diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-08-30 21:34:13 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-30 21:43:02 +0100 |
| commit | 3d1b88049740c5bbb6f6fc2f85e9336fff4fd748 (patch) | |
| tree | 32dad5100133afe1e59bae9a344d12fb5383383c | |
| parent | f56a30a44d0f39d4d2639396253c1c83c1656b3c (diff) | |
| download | kernel_replicant_linux-3d1b88049740c5bbb6f6fc2f85e9336fff4fd748.tar.gz kernel_replicant_linux-3d1b88049740c5bbb6f6fc2f85e9336fff4fd748.tar.bz2 kernel_replicant_linux-3d1b88049740c5bbb6f6fc2f85e9336fff4fd748.zip | |
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().
| -rwxr-xr-x | debian/bin/kconfig.py | 6 | ||||
| -rw-r--r-- | 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 8158399376a2..9ee0750d75fb 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 e052d5522ba0..67309e3a07a0 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) |