[kernel-team] 67/86: * lib/kconfigeditor/kconfig/config.py: Support somehow nested choices. * lib/kconfigeditor/kconfig/menu/file.py: Ignore visible flag.

[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 b599348e2abd7c955e7e185a722fb7344ed7270b
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Feb 8 19:19:18 2011 +0000

    * lib/kconfigeditor/kconfig/config.py: Support somehow nested choices.
    * lib/kconfigeditor/kconfig/menu/file.py: Ignore visible flag.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=16866
---
 .../lib/kconfigeditor/kconfig/config.py            | 24 +++++++++++++---------
 .../lib/kconfigeditor/kconfig/menu/file.py         |  3 +++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
index 1b9557f..9cb94fd 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
@@ -89,16 +89,20 @@ class File(dict):
     def _write_check_visible(self, menufiles):
         ret = set()
 
-        def flatten():
-            for file in menufiles:
-                for entry in file:
-                    if isinstance(entry, MenuEntryConfig):
-                        yield entry
-                    elif isinstance(entry, MenuEntryChoice):
-                        for i in entry:
-                            yield i
-
-        for menuentry in flatten():
+        def flatten(data):
+            for entry in data:
+                if isinstance(entry, MenuEntryConfig):
+                    yield entry
+                elif isinstance(entry, MenuEntryChoice):
+                    for i in flatten(entry):
+                        yield i
+
+        def flatten_all():
+            for f in menufiles:
+                for i in flatten(f):
+                    yield i
+
+        for menuentry in flatten_all():
             if menuentry.prompt:
                 ret.add(menuentry.name)
 
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
index 21f13dd..f19ce82 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
@@ -333,6 +333,9 @@ class _BlockMenu(_BlockObject,
     def process_endmenu(self, text, ind):
         self.pop()
 
+    def process_visible(self, text, ind):
+        pass
+
 class _BlockMenuconfig(_BlockMenu):
     def __init__(self, parent, name):
         super(_BlockMenuconfig, self).__init__(parent, "")

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