[kernel] r6028 - people/waldi/utils/kconfigeditor/kconfigeditor

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 15:44:35 2006
New Revision: 6028

Modified:
   people/waldi/utils/kconfigeditor/kconfigeditor/editor.py
Log:
kconfigeditor/editor.py: Remove support for fake and aliased configs.


Modified: people/waldi/utils/kconfigeditor/kconfigeditor/editor.py
==============================================================================
--- people/waldi/utils/kconfigeditor/kconfigeditor/editor.py	(original)
+++ people/waldi/utils/kconfigeditor/kconfigeditor/editor.py	Thu Mar  2 15:44:35 2006
@@ -8,13 +8,6 @@
 
 _marker = object()
 
-class items_fake(dict):
-    def delete_match(self, key, match):
-        pass
-
-    def get(self, key, default = _marker):
-        pass
-
 class items_real(kconfigfile):
     def delete_match(self, key, value):
         try:
@@ -32,33 +25,9 @@
             return value
         return "x"
 
-class items_ghost(object):
-    def __init__(self, real):
-        self.real = real
-
-    def delete_match(self, key, value):
-        self.real.delete_match(key, value)
-
-    def get(self, key, default = _marker):
-        value = self.real.get(key, _marker)
-        if value is _marker:
-            if default is not _marker:
-                return default
-            raise KeyError()
-        return value
-
-    def get_summary(self, key, default = _marker):
-        value = self.real.get_summary(key, _marker)
-        if value is _marker:
-            if default is not _marker:
-                return default
-            raise KeyError()
-        return value
-
 class editor(object):
     def __init__(self):
         self.columns = {}
-        self.file_inodes = {}
         self.items = {}
         self.variants = sorted_dict()
         self.changed = False
@@ -120,8 +89,6 @@
                 self.add_data(arch, subarch)
                 if subarch != "none":
                     self.add_file("%s/%s/%s/config" % (base, arch, subarch), arch, subarch)
-                else:
-                    self.add_file(None, arch, subarch)
                 for flavour in iter(self.config['base', arch, subarch]['flavours']):
                     self.add_data(arch, subarch, flavour)
                     if subarch == "none":
@@ -156,16 +123,7 @@
 
     def add_file(self, file, arch = None, subarch = None, flavour = None):
         import os, stat
-        if file is None:
-            f = items_fake()
-        else:
-            inode = os.stat(file)[stat.ST_INO]
-            if inode in self.file_inodes:
-                f = items_ghost(self.file_inodes[inode])
-            else:
-                f = items_real(file)
-                self.file_inodes[inode] = f
-        self.items[(arch, subarch, flavour)] = f
+        self.items[(arch, subarch, flavour)] = items_real(file)
 
     def cell_data(self, column, cell, model, iter, data):
         key = model.get_value(iter, 0)