Use util.unique for model

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/attributecode/model.py

@@ -1434,18 +1434,6 @@ def by_name(abouts):
     return OrderedDict(sorted(grouped.items()))
 
 
-def unique(abouts):
-    """
-    Return a list of unique About objects.
-    """
-    uniques = []
-    for about in abouts:
-        if any(about == x for x in uniques):
-            continue
-        uniques.append(about)
-    return uniques
-
-
 def by_license_content(abouts):
     """
     Return an ordered dict sorted by key of About objects grouped by license

tests/test_model.py

@@ -1265,27 +1265,6 @@ def test_collect_inventory_complex_from_directory(self):
 
 class GroupingsTest(unittest.TestCase):
 
-    def test_unique(self):
-        base_dir = 'some_dir'
-        test = {'about_resource': u'.',
-                 'author': u'',
-                 'copyright': u'Copyright (c) 2013-2014 nexB Inc.',
-                u'custom1': u'some custom',
-                u'custom_empty': u'',
-                 'description': u'AboutCode is a tool\nfor files.',
-                 'license': u'apache-2.0',
-                 'name': u'AboutCode',
-                 'owner': u'nexB Inc.'}
-
-        a = model.About()
-        a.load_dict(test, base_dir)
-
-        b = model.About()
-        b.load_dict(test, base_dir)
-        abouts = [a, b]
-        results = model.unique(abouts)
-        assert [a] == results
-
     def test_by_license(self):
         base_dir = 'some_dir'
         a = model.About()

tests/test_util.py

@@ -691,8 +691,37 @@ def test_ungroup_licenses(self):
         assert expected_lic_file == lic_file
         assert expected_lic_url == lic_url
 
-    def test_deduplicate(self):
+    def test_unique_does_deduplicate_and_keep_ordering(self):
         items = ['a', 'b', 'd', 'b', 'c', 'a']
         expected = ['a', 'b', 'd', 'c']
         results = util.unique(items)
         assert expected == results
+
+    def test_unique_can_handle_About_object(self):
+        base_dir = 'some_dir'
+        test = {
+            'about_resource': '.',
+            'author': '',
+            'copyright': 'Copyright (c) 2013-2014 nexB Inc.',
+            'custom1': 'some custom',
+            'custom_empty': '',
+            'description': 'AboutCode is a tool\nfor files.',
+            'license': 'apache-2.0',
+            'name': 'AboutCode',
+            'owner': 'nexB Inc.'
+        }
+
+        a = model.About()
+        a.load_dict(test, base_dir)
+
+        c = model.About()
+        c.load_dict(test, base_dir)
+
+        b = model.About()
+        test.update(dict(about_resource='asdasdasd'))
+        b.load_dict(test, base_dir)
+
+        abouts = [a, b]
+        results = util.unique(abouts)
+        assert [a] == results
+