Move deduplicate function to util.unique

 Also do some minor cosmetic refactoring

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

Author: pombredanne

src/attributecode/gen.py

@@ -21,15 +21,12 @@
 import codecs
 from collections import OrderedDict
 import logging
-from posixpath import basename, dirname, exists, join, normpath
-import sys
-
-if sys.version_info[0] < 3: 
-    # Python 2
-    import backports.csv as csv #NOQA
-else:
-    # Python 3
-    import csv #NOQA
+# FIXME: why posipath???
+from posixpath import basename
+from posixpath import dirname
+from posixpath import exists
+from posixpath import join
+from posixpath import normpath
 
 from attributecode import ERROR
 from attributecode import CRITICAL
@@ -38,8 +35,16 @@
 from attributecode import model
 from attributecode import util
 from attributecode.util import add_unc
+from attributecode.util import python2
 from attributecode.util import to_posix
 from attributecode.util import UNC_PREFIX_POSIX
+from attributecode.util import unique
+
+
+if python2: 
+    import backports.csv as csv #NOQA
+else:
+    import csv #NOQA
 
 
 LOG_FILENAME = 'error.log'
@@ -302,17 +307,7 @@ def generate(location, base_dir, license_notice_text_location=None,
                    u'%(dump_loc)s '
                    u'with error: %(emsg)s' % locals())
             errors.append(Error(ERROR, msg))
-    dedup_errors = deduplicate(errors)
-    return dedup_errors, abouts
+    unique_errors = unique(errors)
+    return unique_errors, abouts
 
 
-def deduplicate(sequence):
-    """
-    Return a list of unique items found in sequence. Preserve the original
-    sequence order.
-    """
-    deduped = []
-    for item in sequence:
-        if item not in deduped:
-            deduped.append(item)
-    return deduped

src/attributecode/util.py

@@ -776,6 +776,21 @@ def format_about_dict_for_json_output(about_dictionary_list):
     return json_formatted_list
 
 
+def unique(sequence):
+    """
+    Return a list of unique items found in sequence. Preserve the original
+    sequence order.
+    For example:
+    >>> unique([1, 5, 3, 5])
+    [1, 5, 3]
+    """
+    deduped = []
+    for item in sequence:
+        if item not in deduped:
+            deduped.append(item)
+    return deduped
+
+
 # FIXME: remove and replace by saneyaml
 from collections import Hashable
 

tests/test_gen.py

@@ -192,9 +192,3 @@ def test_generate_not_overwrite_original_license_file(self):
                     u'licenses:\n'
                     u'    -   file: this.LICENSE\n')
         assert expected == in_mem_result
-
-    def test_deduplicate(self):
-        items = ['a', 'b', 'd', 'b', 'c', 'a']
-        expected = ['a', 'b', 'd', 'c']
-        results = gen.deduplicate(items)
-        assert expected == results

tests/test_util.py

@@ -691,5 +691,8 @@ def test_ungroup_licenses(self):
         assert expected_lic_file == lic_file
         assert expected_lic_url == lic_url
 
-    def test_about_files(self):
-        pass
+    def test_deduplicate(self):
+        items = ['a', 'b', 'd', 'b', 'c', 'a']
+        expected = ['a', 'b', 'd', 'c']
+        results = util.unique(items)
+        assert expected == results