[kernel-team] 78/86: kconfigeditor/package.py: Derive from dict.

[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 764109d66d446bfa96b7377e81ced573059c2faf
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Sep 13 22:14:33 2013 +0000

    kconfigeditor/package.py: Derive from dict.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=20621
---
 utils/kconfigeditor2/kconfigeditor/package.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/utils/kconfigeditor2/kconfigeditor/package.py b/utils/kconfigeditor2/kconfigeditor/package.py
index 9b945f5..8d25c6f 100644
--- a/utils/kconfigeditor2/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/kconfigeditor/package.py
@@ -22,7 +22,7 @@ class PackageFile(object):
             return list(self.kernelarches)[0]
 
 
-class Package(object):
+class Package(dict):
     def __init__(self, root):
         import imp
 
@@ -38,15 +38,13 @@ class Package(object):
         self.config_root = os.path.join(root, "debian/config")
         self.config = module.ConfigCoreHierarchy(config_schema, (self.config_root, ))
 
-        self.files = files = {}
-
         for filename, key, kernelarch in self._collect():
-            if filename in files:
-                data = files[filename]
+            if filename in self:
+                data = self[filename]
                 data.add(key, kernelarch)
             else:
                 file = File(fd=open(os.path.join(self.config_root, filename)))
-                files[filename] = PackageFile(key, kernelarch, file)
+                self[filename] = PackageFile(key, kernelarch, file)
 
     def _collect(self):
         for filename in self._check_config('config'):
@@ -129,13 +127,9 @@ class Package(object):
                 return self._check_config_files(configs)
         return self._check_config_default(default)
 
-    def items(self):
-        for i in self.files.items():
-            yield i
-
     @property
     def kernelarches(self):
         ret = set()
-        for data in self.files.values():
+        for data in self.values():
             ret |= data.kernelarches
         return ret

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