[kernel-team] 02/04: kconfigeditor2: Make kconfig.config.File take a filename instead of a file

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository kernel-team.

commit 242964914a88e729791f9778a66700637ad01d2e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 28 02:37:30 2017 +0000

    kconfigeditor2: Make kconfig.config.File take a filename instead of a file
    
    I want to use the filename in warnings.
---
 utils/kconfigeditor2/kconfigeditor/kconfig/config.py | 7 ++++---
 utils/kconfigeditor2/kconfigeditor/package.py        | 2 +-
 utils/kconfigeditor2/split-common.py                 | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
index 15d3648..847d04d 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/config.py
@@ -5,10 +5,11 @@ from .menu import MenuEntryChoice, MenuEntryConfig
 
 
 class File(dict):
-    def __init__(self, content={}, fd=None):
+    def __init__(self, content={}, name=None):
         super(File, self).__init__(content)
-        if fd:
-            self.read(fd)
+        if name:
+            with open(name) as fd:
+                self.read(fd)
 
     def _write(self, menufiles):
         processed = set()
diff --git a/utils/kconfigeditor2/kconfigeditor/package.py b/utils/kconfigeditor2/kconfigeditor/package.py
index dfc03c2..cc0419f 100644
--- a/utils/kconfigeditor2/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/kconfigeditor/package.py
@@ -41,7 +41,7 @@ class Package(dict):
                 data = self[filename]
                 data.add(key, kernelarch)
             else:
-                file = File(fd=open(os.path.join(self.config_root, filename)))
+                file = File(name=os.path.join(self.config_root, filename))
                 self[filename] = PackageFile(key, kernelarch, file)
 
     def _collect(self):
diff --git a/utils/kconfigeditor2/split-common.py b/utils/kconfigeditor2/split-common.py
index f0c0716..43a4377 100755
--- a/utils/kconfigeditor2/split-common.py
+++ b/utils/kconfigeditor2/split-common.py
@@ -9,7 +9,7 @@ class Main(object):
     def __init__(self, *filenames):
         from kconfigeditor.kconfig.config import File
 
-        input_files = [frozenset(File(fd=open(i)).values()) for i in filenames]
+        input_files = [frozenset(File(name=i).values()) for i in filenames]
 
         output_common = input_files[0].intersection(*input_files[1:])
 

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