Fixed based on 9de0718

Author: chinyeungli

src/attributecode/gen.py

@@ -96,8 +96,12 @@ def check_newline_in_file_field(component):
         if k in file_fields:
             try:
                 if '\n' in component[k]:
-                    msg = ("New line character detected in '%s' for '%s' which is not supported."
-                            "\nPlease use ',' to declare multiple files.") % (k, component['about_resource'])
+                    if k == u'about_resource':
+                        msg = (
+                            "New line character detected in 'about_resource' for '%s' which is not supported.") % component['about_resource']
+                    else:
+                        msg = ("New line character detected in '%s' for '%s' which is not supported."
+                               "\nPlease use ',' to declare multiple files.") % (k, component['about_resource'])
                     errors.append(Error(CRITICAL, msg))
             except:
                 pass
@@ -111,7 +115,7 @@ def check_about_resource_filename(arp):
     """
     if invalid_chars(arp):
         msg = ("Invalid characters present in 'about_resource' "
-                   "field: " + arp)
+               "field: " + arp)
         return (Error(ERROR, msg))
     return ''
 
@@ -185,7 +189,8 @@ def load_inventory(location, from_attrib=False, base_dir=None, scancode=False, r
                 if from_attrib and f == 'about_resource':
                     continue
                 else:
-                    msg = "Required field: %(f)r not found in the <input>" % locals()
+                    msg = "Required field: %(f)r not found in the <input>" % locals(
+                    )
                     errors.append(Error(CRITICAL, msg))
                     return errors, abouts
         # Set about file path to '' if no 'about_resource' is provided from
@@ -245,7 +250,8 @@ def load_inventory(location, from_attrib=False, base_dir=None, scancode=False, r
 
         abouts.append(about)
     if custom_fields_list:
-        custom_fields_err_msg = 'Field ' + str(custom_fields_list) + ' is a custom field.'
+        custom_fields_err_msg = 'Field ' + \
+            str(custom_fields_list) + ' is a custom field.'
         errors.append(Error(INFO, custom_fields_err_msg))
     # Covert the license_score value from string to list of int
     # The licesne_score is not in the spec but is specify in the scancode license scan.
@@ -254,7 +260,8 @@ def load_inventory(location, from_attrib=False, base_dir=None, scancode=False, r
     if scancode:
         for about in abouts:
             try:
-                score_list = list(map(float, about.license_score.value.replace('[', '').replace(']', '').split(',')))
+                score_list = list(map(float, about.license_score.value.replace(
+                    '[', '').replace(']', '').split(',')))
                 about.license_score.value = score_list
             except:
                 pass
@@ -297,7 +304,8 @@ def generate(location, base_dir, android=None, reference_dir=None, fetch_license
     )
 
     if gen_license:
-        license_dict, err = model.pre_process_and_fetch_license_dict(abouts, api_url, api_key)
+        license_dict, err = model.pre_process_and_fetch_license_dict(
+            abouts, api_url, api_key)
         if err:
             for e in err:
                 # Avoid having same error multiple times
@@ -343,7 +351,8 @@ def generate(location, base_dir, android=None, reference_dir=None, fetch_license
                 # be validated when creating the about object
                 loc = util.to_posix(dump_loc)
                 about_file_loc = loc
-                path = join(dirname(util.to_posix(about_file_loc)), about_resource_value)
+                path = join(dirname(util.to_posix(about_file_loc)),
+                            about_resource_value)
                 if not exists(path):
                     path = util.to_posix(path.strip(UNC_PREFIX_POSIX))
                     path = normpath(path)
@@ -355,10 +364,12 @@ def generate(location, base_dir, android=None, reference_dir=None, fetch_license
             licenses_dict = {}
             if gen_license:
                 # Write generated LICENSE file
-                license_key_name_context_url_list = about.dump_lic(dump_loc, license_dict)
+                license_key_name_context_url_list = about.dump_lic(
+                    dump_loc, license_dict)
                 if license_key_name_context_url_list:
                     for lic_key, lic_name, lic_filename, lic_context, lic_url, spdx_lic_key in license_key_name_context_url_list:
-                        licenses_dict[lic_key] = [lic_name, lic_filename, lic_context, lic_url, spdx_lic_key]
+                        licenses_dict[lic_key] = [
+                            lic_name, lic_filename, lic_context, lic_url, spdx_lic_key]
                         if not lic_name in about.license_name.value:
                             about.license_name.value.append(lic_name)
                         about.license_file.value[lic_filename] = lic_filename