Revert to use orderdict for about_resource and about_resource_path

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/gen.py

@@ -234,18 +234,22 @@ def generate(location, base_dir, license_notice_text_location=None,
 
         try:
             # Generate value for 'about_resource' if it does not exist
+            # Note: The `about_resource` and `about_resource_path` have
+            # OrderDict as the value type from PathField
             if not about.about_resource.value:
+                about.about_resource.value = OrderedDict()
                 if about.about_file_path.endswith('/'):
-                    about.about_resource.value.append(u'.')
+                    about.about_resource.value[u'.'] = None
                     about.about_resource.original_value = u'.'
                 else:
-                    about.about_resource.value.append(posixpath.basename(about.about_file_path))
+                    about.about_resource.value[posixpath.basename(about.about_file_path)] = None
                     about.about_resource.original_value = posixpath.basename(about.about_file_path)
                 about.about_resource.present = True
 
             # Generate value for 'about_resource_path' if it does not exist
             # Basically, this should be the same as the 'about_resource'
             if not about.about_resource_path.value:
+                about.about_resource_path.value = OrderedDict()
                 about.about_resource_path.value = about.about_resource.value
                 about.about_resource_path.present = True
 

tests/test_gen.py

@@ -111,18 +111,20 @@ def test_generation_with_no_about_resource(self):
         location = get_test_loc('gen/inv2.csv')
         base_dir = get_temp_dir()
         errors, abouts = gen.generate(location, base_dir)
-        expected = [u'.']
-        assert abouts[0].about_resource.value == expected
+        expected_dict = OrderedDict()
+        expected_dict[u'.'] = None
+        assert abouts[0].about_resource.value == expected_dict
         assert len(errors) == 0
 
     def test_generation_with_no_about_resource_reference(self):
         location = get_test_loc('gen/inv3.csv')
         base_dir = get_temp_dir()
 
         errors, abouts = gen.generate(location, base_dir)
-        expected = [u'test.tar.gz']
+        expected_dict = OrderedDict()
+        expected_dict[u'test.tar.gz'] = None
 
-        assert abouts[0].about_resource.value == expected
+        assert abouts[0].about_resource.value == expected_dict
         assert len(errors) == 1
         msg = u'The reference file'
         assert msg in errors[0].message