[kernel] r16866 - in people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig: . menu

[Bastian Blank]

Author: waldi
Date: Tue Feb  8 19:19:18 2011
New Revision: 16866

Log:
* lib/kconfigeditor/kconfig/config.py: Support somehow nested choices.
* lib/kconfigeditor/kconfig/menu/file.py: Ignore visible flag.

Modified:
   people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
   people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py

Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py	Tue Feb  8 19:08:41 2011	(r16865)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py	Tue Feb  8 19:19:18 2011	(r16866)
@@ -89,16 +89,20 @@
     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
+        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():
+        for menuentry in flatten_all():
             if menuentry.prompt:
                 ret.add(menuentry.name)
 

Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py	Tue Feb  8 19:08:41 2011	(r16865)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py	Tue Feb  8 19:19:18 2011	(r16866)
@@ -333,6 +333,9 @@
     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, "")