Fixed #444 - Bug for single license with multi files

Author: chinyeungli

docs/CHANGELOG.rst

@@ -2,7 +2,7 @@
     Release 5.1.0
 
     * Add support for `package_url` #396
-    * Fixed #443 strip carriage return character
+    * Fixed #443 and #444 issue with multiple licenses/license_files
 
 2020-08-11
     Release 5.0.0

src/attributecode/model.py

@@ -1073,11 +1073,14 @@ def dumps(self):
                             else:
                                 license_file.append(lic)
                     else:
-                        license_file = field.value.keys()
+                        if isinstance(field.original_value, list):
+                            license_file = field.value.keys()
+                        else:
+                            # Restore the original license_file value
+                            # See #444
+                            license_file = [field.original_value]
                 else:
                     license_file = field.value.keys()
-                # Strip carriage See #433
-                
             elif field.name == 'license_url' and field.value:
                 license_url = field.value
 

tests/test_gen.py

@@ -215,6 +215,23 @@ def test_generate_multi_lic_issue_443(self):
         )
         assert expected == result
 
+    def test_generate_multi_lic_issue_444(self):
+        location = get_test_loc('test_gen/multi_lic_issue_444/test1.csv')
+        base_dir = get_temp_dir()
+
+        errors, abouts = gen.generate(location, base_dir)
+
+        result = [a.dumps() for a in abouts][0]
+        expected = (
+'''about_resource: test.c
+name: test.c
+licenses:
+  - key: License1
+    file: LIC1.LICENSE, LIC2.LICENSE
+'''
+        )
+        assert expected == result
+
     @skip('FIXME: this test is making a failed, live API call')
     def test_generate_not_overwrite_original_license_file(self):
         location = get_test_loc('test_gen/inv5.csv')

tests/testdata/test_gen/multi_lic_issue_444/test1.csv

@@ -0,0 +1,2 @@
+about_resource,name,license_key,license_file
+3rdParty/test.c,test.c,License1,"LIC1.LICENSE, LIC2.LICENSE"