Merge branch '443_strip_carriage' into develop

Author: chinyeungli

docs/CHANGELOG.rst

@@ -2,6 +2,7 @@
     Release 5.1.0
 
     * Add support for `package_url` #396
+    * Fixed #443 strip carriage return character
 
 2020-08-11
     Release 5.0.0

src/attributecode/model.py

@@ -1064,11 +1064,20 @@ def dumps(self):
                     # This line break is for the components that have multiple license
                     # values in CSV format.
                     if '\n' in field.original_value:
-                        license_file = field.original_value.split('\n')
+                        license_file_list = field.original_value.split('\n')
+                        license_file = []
+                        # Strip the carriage return character '\r' See #443
+                        for lic in license_file_list:
+                            if '\r' in lic:
+                                license_file.append(lic.strip('\r'))
+                            else:
+                                license_file.append(lic)
                     else:
                         license_file = field.value.keys()
                 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

@@ -193,6 +193,28 @@ def test_generate(self):
         )
         assert expected == result
 
+    def test_generate_multi_lic_issue_443(self):
+        location = get_test_loc('test_gen/multi_lic_issue_443/test.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
+name: test
+version: '1.5'
+licenses:
+  - key: License1
+    file: LIC1.LICENSE
+  - key: License2
+    file: LIC2.LICENSE
+  - key: License3
+    file: LIC3.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_443/test.csv

@@ -0,0 +1,6 @@
+about_resource,name,version,license_key,license_file
+3rdParty/test,test,1.5,"License1
+License2
+License3","LIC1.LICENSE
+LIC2.LICENSE
+LIC3.LICENSE"