Remove mapping_output feature

Mapping can now only be used when using a CSV as an input.

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

Author: pombredanne

src/attributecode/model.py

@@ -1358,25 +1358,19 @@ def about_object_to_list_of_dictionary(abouts, with_absent=False, with_empty=Tru
     return abouts_dictionary_list
 
 
-def write_output(abouts, location, format, mapping_output=None, with_absent=False, with_empty=True):  # NOQA
+def write_output(abouts, location, format, with_absent=False, with_empty=True):  # NOQA
     """
-    Write a CSV/JSON file at location given a list of About objects
+    Write a CSV/JSON file at location given a list of About objects.
+    Return a list of Error objects.
     """
     errors = []
     about_dictionary_list = about_object_to_list_of_dictionary(abouts, with_absent, with_empty)
-    if mapping_output:
-        updated_dictionary_list = util.update_about_dictionary_keys(about_dictionary_list, mapping_output)
-    else:
-        updated_dictionary_list = about_dictionary_list
+    updated_dictionary_list = about_dictionary_list
     location = add_unc(location)
     with codecs.open(location, mode='wb', encoding='utf-8') as output_file:
         if format == 'csv':
             fieldnames = field_names(abouts)
-            if mapping_output:
-                updated_fieldnames = util.update_fieldnames(fieldnames, mapping_output)
-            else:
-                updated_fieldnames = fieldnames
-            writer = csv.DictWriter(output_file, updated_fieldnames)
+            writer = csv.DictWriter(output_file, fieldnames)
             writer.writeheader()
             csv_formatted_list = util.format_about_dict_for_csv_output(updated_dictionary_list)
             for row in csv_formatted_list:

src/attributecode/util.py

@@ -658,40 +658,6 @@ def inventory_filter(abouts, filters):
     return matching_abouts
 
 
-# FIXME: rename function: this is mapping field names. Also this is returning a list...
-# since the list should contain NO duplicate, it would be best to simply return an
-# ordered mapping {old name: new name}
-def update_fieldnames(field_names, mapping_location):
-    """
-    Given a `field_names` list of field names and a `mapping_location` mapping
-    configuration file location, return a list of updated field names
-    """
-    mapping = get_mapping(mapping_location, lowercase=False)
-    updated_names = []
-    for name in field_names:
-        if name in mapping:
-            name = mapping[name]
-        updated_names.append(name)
-    return updated_names
-
-
-# FIXME: add docstring
-def update_about_dictionary_keys(about_dictionary_list, mapping_output):
-    output_map = get_mapping(mapping_output, lowercase=False)
-    updated_dict_list = []
-    for element in about_dictionary_list:
-        updated_ordered_dict = OrderedDict()
-        for about_key, value in element.items():
-            update_key = False
-            for custom_key in output_map:
-                if about_key == custom_key:
-                    update_key = True
-                    updated_ordered_dict[output_map[custom_key]] = value
-                    break
-            if not update_key:
-                updated_ordered_dict[about_key] = value
-        updated_dict_list.append(updated_ordered_dict)
-    return updated_dict_list
 
 
 # FIXME: we should use a license object instead

tests/test_util.py

@@ -369,21 +369,6 @@ def test_load_mapping_only_load_last_instance_of_duplicated_keys(self):
         expected = OrderedDict([(u'descr', u'description3'), (u'other', u'bar')])
         assert expected == result
 
-    def test_update_fieldnames(self):
-        mapping_loc = get_test_loc('test_util/mapping/fieldnames_mapping.config')
-        field_names = ['about_file_path', 'name', 'version']
-        expected = ['about_file_path', 'Component', 'version']
-        result = util.update_fieldnames(field_names, mapping_loc)
-        assert expected == result
-
-    def test_update_about_dictionary_keys(self):
-        mapping_loc = get_test_loc('test_util/mapping/fieldnames_mapping.config')
-        abouts = [dict(name='test.c')]
-        expected = [dict(Component='test.c')]
-        result = util.update_about_dictionary_keys(abouts, mapping_loc)
-        assert expected == result
-
-
 
 class TestCsv(unittest.TestCase):