[kernel] r18041 - dists/trunk/linux-2.6/debian/lib/python/debian_linux

[Ben Hutchings]

Author: benh
Date: Sat Sep  3 20:53:59 2011
New Revision: 18041

Log:
Move debian_linux.utils.Templates._read_control out to module scope

Modified:
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py	Thu Sep  1 05:52:42 2011	(r18040)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py	Sat Sep  3 20:53:59 2011	(r18041)
@@ -55,46 +55,9 @@
             if os.path.exists(filename):
                 f = file(filename)
                 if prefix == 'control':
-                    return self._read_control(f)
+                    return read_control(f)
                 return f.read()
 
-    def _read_control(self, f):
-        from .debian import Package
-
-        entries = []
-
-        while True:
-            e = Package()
-            last = None
-            lines = []
-            while True:
-                line = f.readline()
-                if not line:
-                    break
-                line = line.strip('\n')
-                if not line:
-                    break
-                if line[0] in ' \t':
-                    if not last:
-                        raise ValueError('Continuation line seen before first header')
-                    lines.append(line.lstrip())
-                    continue
-                if last:
-                    e[last] = '\n'.join(lines)
-                i = line.find(':')
-                if i < 0:
-                    raise ValueError("Not a header, not a continuation: ``%s''" % line)
-                last = line[:i]
-                lines = [line[i+1:].lstrip()]
-            if last:
-                e[last] = '\n'.join(lines)
-            if not e:
-                break
-
-            entries.append(e)
-
-        return entries
-
     def get(self, key, default=None):
         if key in self._cache:
             return self._cache[key]
@@ -104,6 +67,43 @@
             return default
         return value
 
+def read_control(f):
+    from .debian import Package
+
+    entries = []
+
+    while True:
+        e = Package()
+        last = None
+        lines = []
+        while True:
+            line = f.readline()
+            if not line:
+                break
+            line = line.strip('\n')
+            if not line:
+                break
+            if line[0] in ' \t':
+                if not last:
+                    raise ValueError('Continuation line seen before first header')
+                lines.append(line.lstrip())
+                continue
+            if last:
+                e[last] = '\n'.join(lines)
+            i = line.find(':')
+            if i < 0:
+                raise ValueError("Not a header, not a continuation: ``%s''" % line)
+            last = line[:i]
+            lines = [line[i+1:].lstrip()]
+        if last:
+            e[last] = '\n'.join(lines)
+        if not e:
+            break
+
+        entries.append(e)
+
+    return entries
+
 class TextWrapper(textwrap.TextWrapper):
     wordsep_re = re.compile(
         r'(\s+|'                                  # any whitespace