[kernel-team] 77/86: Make a bit Python 3 compatible.

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch benh/kconfigeditor2
in repository kernel-team.

commit c8747e49a987616c3e8f23b83c0efd6280a884a2
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Sep 13 22:07:28 2013 +0000

    Make a bit Python 3 compatible.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=20620
---
 utils/kconfigeditor2/kconfigeditor/kconfig/config.py    | 2 +-
 utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py  | 2 +-
 utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py | 4 ++--
 utils/kconfigeditor2/kconfigeditor/package.py           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
index 5f30e65..132bcdd 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
@@ -121,7 +121,7 @@ class File(dict):
                 pass
 
             else:
-                raise RuntimeError, "Can't recognize %s" % line
+                raise RuntimeError("Can't recognize %s" % line)
 
 
 class FileEntry(object):
diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py
index da01767..b298698 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/all.py
@@ -47,4 +47,4 @@ class All(object):
             yield i
 
     def read(self, filename):
-         return Parser()(file(os.path.join(self.root, filename)), filename)
+         return Parser()(open(os.path.join(self.root, filename)), filename)
diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
index f19ce82..ce727b0 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
@@ -35,7 +35,7 @@ class Parser(object):
             else:
                 try:
                     stack.top().process_line(line)
-                except ParseException, e:
+                except ParseException as e:
                     e.filename = filename
                     e.lineno = lineno
                     raise
@@ -168,7 +168,7 @@ class _BlockRoot(
         stack.push(self)
 
     def __getattr__(self, name):
-        raise AttributeError, name
+        raise AttributeError(name)
 
     def process_mainmenu(self, text, ind):
         pass
diff --git a/utils/kconfigeditor2/kconfigeditor/package.py b/utils/kconfigeditor2/kconfigeditor/package.py
index adcfea1..9b945f5 100644
--- a/utils/kconfigeditor2/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/kconfigeditor/package.py
@@ -130,12 +130,12 @@ class Package(object):
         return self._check_config_default(default)
 
     def items(self):
-        for i in self.files.iteritems():
+        for i in self.files.items():
             yield i
 
     @property
     def kernelarches(self):
         ret = set()
-        for data in self.files.itervalues():
+        for data in self.files.values():
             ret |= data.kernelarches
         return ret

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