#403 - Restore fixes for incorrect data for boolean field

Author: chinyeungli

src/attributecode/model.py

@@ -61,11 +61,13 @@
 from attributecode import saneyaml
 from attributecode import util
 from attributecode.util import add_unc
+from attributecode.util import boolean_fields
 from attributecode.util import copy_license_notice_files
 from attributecode.util import csv
 from attributecode.util import filter_errors
 from attributecode.util import is_valid_name
 from attributecode.util import on_windows
+from attributecode.util import wrap_boolean_value
 from attributecode.util import UNC_PREFIX
 from attributecode.util import ungroup_licenses
 from attributecode.util import unique
@@ -119,7 +121,7 @@ def validate(self, *args, **kwargs):
             # present fields should have content ...
             # The boolean value can be True, False and None
             # The value True or False is the content of boolean fields
-            if not self.has_content:
+            if not name in boolean_fields and not self.has_content:
                 # ... especially if required
                 if self.required:
                     msg = u'Field %(name)s is required and empty'
@@ -585,8 +587,7 @@ def _validate(self, *args, **kwargs):
             self.value = None
         elif flag is None:
             name = self.name
-            msg = (u'Field %(name)s: field is empty. '
-                   u'Defaulting flag to no.' % locals())
+            msg = (u'Field %(name)s: field is present but empty. ' % locals())
             errors.append(Error(INFO, msg))
             self.value = None
         else:
@@ -794,8 +795,21 @@ def __eq__(self, other):
     def all_fields(self):
         """
         Return the list of all Field objects.
+        If with_absent, include absent (not present) fields.
+        If with_empty, include empty fields.
         """
-        return list(self.fields.values()) + list(self.custom_fields.values())
+        all_fields = []
+
+        for field in list(self.fields.values()) + list(self.custom_fields.values()):
+            if field.required:
+                all_fields.append(field)
+            else:
+                if field.present:
+                    if field.value:
+                        all_fields.append(field)
+                    elif field.name in boolean_fields and not field.value == None:
+                        all_fields.append(field)
+        return all_fields
 
     def as_dict(self):
         """
@@ -926,6 +940,10 @@ def load(self, location):
             loc = add_unc(loc)
             with io.open(loc, encoding='utf-8') as txt:
                 input_text = txt.read()
+            # The 'Yes' and 'No' will be converted to 'True' and 'False' in the yaml.load()
+            # Therefore, we need to wrap the original value in quote to prevent
+            # the conversion
+            input = wrap_boolean_value(input_text)
             # FIXME: this should be done in the commands, not here
             """
             The running_inventory defines if the current process is 'inventory' or not.
@@ -937,7 +955,7 @@ def load(self, location):
             and then join with the 'about_resource'
             """
             running_inventory = True
-            data = saneyaml.load(input_text, allow_duplicate_keys=False)
+            data = saneyaml.load(input, allow_duplicate_keys=False)
             errs = self.load_dict(data, base_dir, running_inventory)
             errors.extend(errs)
         except Exception as e:
@@ -1127,7 +1145,6 @@ def collect_inventory(location):
             msg = (about_file_path + ": " + message)
             errors.append(Error(severity, msg))
         abouts.append(about)
-
     return unique(errors), abouts
 
 

src/attributecode/util.py

@@ -51,6 +51,8 @@
 
 on_windows = 'win32' in sys.platform
 
+# boolean field name
+boolean_fields = ['redistribute', 'attribute', 'track_change', 'modified', 'internal_use_only']
 
 def to_posix(path):
     """
@@ -123,6 +125,23 @@ def check_file_names(paths):
             seen[path] = orig_path
     return errors
 
+def wrap_boolean_value(context):
+    updated_context = ''
+    for line in context.splitlines():
+        """
+        wrap the boolean value in quote
+        """
+        key = line.partition(':')[0]
+        value = line.partition(':')[2].strip()
+        value = '"' + value + '"'
+        print(value)
+        if key in boolean_fields and not value == "":
+            updated_context += key + ': ' + value + '\n'
+        else:
+            updated_context += line + '\n'
+    print("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@")
+    print(updated_context)
+    return updated_context
 
 # TODO: rename to normalize_path
 def get_absolute(location):