[kernel-team] 74/86: kconfigeditor/kconfig/config.py: Remove old visible check.

[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 37025d8535b6d127ff21573d26d747108640eee3
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Sep 13 21:54:44 2013 +0000

    kconfigeditor/kconfig/config.py: Remove old visible check.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=20617
---
 .../kconfigeditor2/kconfigeditor/kconfig/config.py | 41 ++++------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
index 17c53e2..0a3a0ae 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
@@ -12,12 +12,10 @@ class File(dict):
             self.read(fd)
 
     def _write(self, menufiles):
-        visible = self._write_check_visible(menufiles)
-
         processed = set()
 
         for file in menufiles:
-            for i in self._write_file(processed, visible, file):
+            for i in self._write_file(processed, file):
                 yield i
 
         unprocessed = set(self) - processed
@@ -32,14 +30,14 @@ class File(dict):
                     yield i
             yield ''
 
-    def _write_file(self, processed, visible, file):
+    def _write_file(self, processed, file):
         ret = []
 
         for entry in file:
             if isinstance(entry, MenuEntryConfig):
-                ret.extend(self._write_entry_config(processed, visible, entry))
+                ret.extend(self._write_entry_config(processed, entry))
             elif isinstance(entry, MenuEntryChoice):
-                ret.extend(self._write_entry_choice(processed, visible, entry))
+                ret.extend(self._write_entry_choice(processed, entry))
 
         if ret:
             yield '##'
@@ -49,12 +47,12 @@ class File(dict):
                 yield i
             yield ''
 
-    def _write_entry_choice(self, processed, visible, entry):
+    def _write_entry_choice(self, processed, entry):
         ret = []
 
         for subentry in entry:
             if isinstance(subentry, MenuEntryConfig):
-                r = list(self._write_entry_config(processed, visible, subentry))
+                r = list(self._write_entry_config(processed, subentry))
                 ret.extend(r)
 
         if ret:
@@ -63,12 +61,9 @@ class File(dict):
                 yield i
             yield '## end choice'
 
-    def _write_entry_config(self, processed, visible, entry):
+    def _write_entry_config(self, processed, entry):
         if entry.name in processed:
             return
-        if not entry.name in visible:
-            processed.add(entry.name)
-            return
 
         value = self.get(entry.name)
         if value is None:
@@ -79,28 +74,6 @@ class File(dict):
             for i in value.write():
                 yield i
 
-    def _write_check_visible(self, menufiles):
-        ret = set()
-
-        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)
-
-        return ret
-
     def write(self, fd):
         keys = list(self.iterkeys())
         keys.sort()

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