Merge lp:~jelmer/launchpad/remove-archiveuploader-utils into lp:launchpad

[Jelmer Vernooij]

Remove lp.archiveuploader.utils.build_file_list.

build_file_list() in lp.archiveuploader.utils is not used anywhere except its own test. This branch removes it.

[Michael Nelson (michael.nelson)]

Nice and easy :)

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/tests/test_utils.py'
--- lib/lp/archiveuploader/tests/test_utils.py	2010-08-20 20:31:18 +0000
+++ lib/lp/archiveuploader/tests/test_utils.py	2010-08-26 12:51:50 +0000
@@ -124,17 +124,6 @@
         self.assertEquals(sect, "libs")
         self.assertEquals(comp, "restricted")
 
-    def testBuildFileListFromChanges(self):
-        """lp.archiveuploader.utils.build_file_list should be capable of
-           reading changes files
-        """
-        from lp.archiveuploader.utils import build_file_list
-        from lp.archiveuploader.tagfiles import parse_tagfile
-
-        ch = parse_tagfile(datadir("good-signed-changes"))
-        fl = build_file_list(ch)
-        self.assertEquals("abiword_2.0.10-1.2_mips.deb" in fl, True)
-
     def testFixMaintainerOkay(self):
         """lp.archiveuploader.utils.fix_maintainer should parse correct values
         """

=== modified file 'lib/lp/archiveuploader/utils.py'
--- lib/lp/archiveuploader/utils.py	2010-08-20 20:31:18 +0000
+++ lib/lp/archiveuploader/utils.py	2010-08-26 12:51:50 +0000
@@ -133,54 +133,6 @@
     return (section, component)
 
 
-def build_file_list(tagfile, is_dsc = False, default_component="main"):
-    files = {}
-
-    if "files" not in tagfile:
-        raise ValueError("No Files section in supplied tagfile")
-
-    format = tagfile["format"]
-
-    format = float(format)
-
-    if not is_dsc and (format < 1.5 or format > 2.0):
-        raise ValueError("Unsupported format '%s'" % tagfile["format"])
-
-    for line in tagfile["files"].split("\n"):
-        if not line:
-            break
-
-        tokens = line.split()
-
-        section = priority = ""
-
-        try:
-            if is_dsc:
-                (md5, size, name) = tokens
-            else:
-                (md5, size, section, priority, name) = tokens
-        except ValueError:
-            raise TagFileParseError(line)
-
-        if section == "":
-            section = "-"
-        if priority == "":
-            priority = "-"
-
-        (section, component) = extract_component_from_section(
-            section, default_component)
-
-        files[name] = {
-            "md5sum": md5,
-            "size": size,
-            "section": section,
-            "priority": priority,
-            "component": component,
-            }
-
-    return files
-
-
 def force_to_utf8(s):
     """Forces a string to UTF-8.