[kernel-team] 60/86: lib/kconfigeditor/package.py - Import config module by hand. - Make data a real object.

[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 f7a3e1a6af1fdd106c1a70aa97d548ee028476c6
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Dec 4 14:01:43 2009 +0000

    lib/kconfigeditor/package.py
    - Import config module by hand.
    - Make data a real object.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=14723
---
 utils/kconfigeditor2/lib/kconfigeditor/package.py | 28 +++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/package.py b/utils/kconfigeditor2/lib/kconfigeditor/package.py
index d901639..c2b4a44 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/package.py
@@ -2,29 +2,39 @@ from __future__ import absolute_import
 
 import os
 
-from debian_linux.config import ConfigCoreHierarchy
-
 from .kconfig.menu import MenuEntryChoice, MenuEntryConfig
 from .kconfig.config import File
 
 
+class PackageFile(object):
+    def __init__(self, key, kernelarch, file):
+        self.keys, self.kernelarch, self.file = [key], kernelarch, file
+
+    def add(self, key, kernelarch):
+        self.keys.append(key)
+        if self.kernelarch != kernelarch:
+            self.kernelarch = None
+
+
 class Package(object):
     def __init__(self, root):
+        import imp
+
+        data = imp.find_module('config', [os.path.join(root, 'debian', 'lib', 'python', 'debian_linux')])
+        module = imp.load_module('config', *data)
+        print module
         self.config_root = os.path.join(root, "debian/config")
-        self.config = ConfigCoreHierarchy([self.config_root])
+        self.config = module.ConfigCoreHierarchy([self.config_root])
 
         self.files = files = {}
 
         for filename, key, kernelarch in self._collect():
             if filename in files:
                 data = files[filename]
-                data['keys'].append(key)
-                if data['kernelarch'] != kernelarch:
-                    data['kernelarch'] = None
+                data.add(key, kernelarch)
             else:
-                file = File()
-                file.read(open(os.path.join(self.config_root, filename)))
-                files[filename] = {'file': file, 'keys': [key], 'kernelarch': kernelarch}
+                file = File(fd=open(os.path.join(self.config_root, filename)))
+                files[filename] = PackageFile(key, kernelarch, file)
 
     def _collect(self):
         for filename in self._check_config('config'):

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