Merge lp:~sil2100/langpack-o-matic/domains_as_lists into lp:langpack-o-matic

[Łukasz Zemczak]

Mapping files can have multiple entries for one domain - tread each entry as a list.

Mapping files can have multiple entries for one domain - tread each entry as a list.

Had to switch off from the KeyError route as we're using a defaultdict now. Tested this locally and it seemed to work properly this time.

[Martin Pitt (pitti)]

Looks mostly good to me, except for a stylistic issue (see inline comment). If that passes the tests (tests/run), please go ahead.

[lp:~sil2100/langpack-o-matic/domains_as_lists]

561. By Łukasz Zemczak on 2016-04-11

As per pitti's request, do not use collections defaultdict, rename pkg_domain to pkg_domains.

[Łukasz Zemczak (sil2100)]

Tests are passing. Merging this, thanks!

=== modified file 'import'
--- import	2016-03-31 09:29:25 +0000
+++ import	2016-04-11 12:59:53 +0000
@@ -101,13 +101,13 @@
     '''Return set of domains corresponding to packages list'''
 
     # read domain map.txt
-    pkg_domain = {}
+    pkg_domains = {}
     with open(map_file) as f:
         for line in f:
             f = line.split()
             if len(f) != 2:
                 continue
-            pkg_domain[f[0]] = f[1]
+            pkg_domains.setdefault(f[0], []).append(f[1])
 
     domains = set()
     with open(packages) as f:
@@ -115,9 +115,9 @@
             pkg = line.strip()
             if not pkg:
                 continue
-            try:
-                domains.add(pkg_domain[pkg])
-            except KeyError:
+            if pkg in pkg_domains:
+                domains.update(pkg_domains[pkg])
+            else:
                 logging.debug('package %s is in --pkglist, but not in mapping.txt', pkg)
     return domains