[kernel-team] 01/01: kconfigeditor2: Use 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 kernel-team.

commit bf82dbe52e1b6fafd6c76e7721b8152183f24bf9
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jan 9 21:16:15 2017 +0000

    kconfigeditor2: Use Python 3
    
    I've recently removed Python 2 backward-compatibility from src:linux's
    debian_linux package.  That broke kconfigeditor2, whose script shebang
    lines still select python2.6.
    
    It's mostly Python 3 compatible already, so the only changes are:
    
    - Replace various iterator function calls
    - Update the shebang lines
    - Delete redundant 'from __future__' statements
---
 utils/kconfigeditor2/kconfigeditor/kconfig/config.py    | 4 +---
 utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py  | 2 --
 utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py | 2 --
 utils/kconfigeditor2/kconfigeditor/package.py           | 2 --
 utils/kconfigeditor2/process.py                         | 2 +-
 utils/kconfigeditor2/show-enabled.py                    | 3 +--
 utils/kconfigeditor2/split-common.py                    | 7 +++----
 7 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
index 814b3a6..15d3648 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 import re
 
@@ -73,7 +71,7 @@ class File(dict):
                 yield i
 
     def write(self, fd):
-        keys = list(self.iterkeys())
+        keys = list(self.keys())
         keys.sort()
         for name in keys:
             fd.write(str(self.get(name)) + '\n')
diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py
index b298698..2c8faac 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 
 from . import MenuEntrySource
diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
index 795e44a..a5be524 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import re
 
 from . import MenuEntryChoice, MenuEntryConfig, MenuEntrySource
diff --git a/utils/kconfigeditor2/kconfigeditor/package.py b/utils/kconfigeditor2/kconfigeditor/package.py
index 8d25c6f..dfc03c2 100644
--- a/utils/kconfigeditor2/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/kconfigeditor/package.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 
 from .kconfig.menu import MenuEntryChoice, MenuEntryConfig
diff --git a/utils/kconfigeditor2/process.py b/utils/kconfigeditor2/process.py
index 1318974..c4675da 100755
--- a/utils/kconfigeditor2/process.py
+++ b/utils/kconfigeditor2/process.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import optparse
 import os
diff --git a/utils/kconfigeditor2/show-enabled.py b/utils/kconfigeditor2/show-enabled.py
index f123985..c100dc7 100755
--- a/utils/kconfigeditor2/show-enabled.py
+++ b/utils/kconfigeditor2/show-enabled.py
@@ -1,6 +1,5 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python3
 
-import itertools
 import optparse
 import os
 import sys
diff --git a/utils/kconfigeditor2/split-common.py b/utils/kconfigeditor2/split-common.py
index 7af77e9..f0c0716 100755
--- a/utils/kconfigeditor2/split-common.py
+++ b/utils/kconfigeditor2/split-common.py
@@ -1,6 +1,5 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python3
 
-import itertools
 import optparse
 import os
 import sys
@@ -10,7 +9,7 @@ class Main(object):
     def __init__(self, *filenames):
         from kconfigeditor.kconfig.config import File
 
-        input_files = [frozenset(File(fd=open(i)).itervalues()) for i in filenames]
+        input_files = [frozenset(File(fd=open(i)).values()) for i in filenames]
 
         output_common = input_files[0].intersection(*input_files[1:])
 
@@ -18,7 +17,7 @@ class Main(object):
 
         self.write('output-common', output_common)
 
-        for output, id in itertools.izip(output_files, xrange(1, len(output_files) + 1)):
+        for output, id in zip(output_files, range(1, len(output_files) + 1)):
             self.write('output-part-%d' % id, output)
 
     def write(self, filename, content):

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