Correct error message

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

Author: chinyeungli

src/attributecode/model.py

@@ -718,8 +718,8 @@ def validate_fields(fields, about_file_path, running_inventory, base_dir,
 
 def validate_field_name(name):
     if not is_valid_name(name):
-        msg = ('Field name: %(name)r contains illegal name characters: '
-               '0 to 9, a to z, A to Z and _. (or empty spaces) and is ignored.')
+        msg = ('Field name: %(name)r contains illegal name characters '
+               '(or empty spaces) and is ignored.')
         return Error(CRITICAL, msg % locals())
 
 
@@ -952,8 +952,8 @@ def hydrate(self, fields):
                     errors.append(Error(CRITICAL, msg % locals()))
 
         if illegal_name_list:
-            msg = ('Field name: %(illegal_name_list)r contains illegal name characters: '
-               '0 to 9, a to z, A to Z and _. (or empty spaces) and is ignored.')
+            msg = ('Field name: %(illegal_name_list)r contains illegal name characters '
+               '(or empty spaces) and is ignored.')
             errors.append(Error(CRITICAL, msg % locals()))
         return errors
 

tests/test_gen.py

@@ -103,7 +103,7 @@ def test_load_inventory_with_errors(self):
         base_dir = get_temp_dir()
         errors, abouts = gen.load_inventory(location, base_dir=base_dir)
         expected_errors = [
-            Error(CRITICAL, "Field name: ['confirmed copyright'] contains illegal name characters: 0 to 9, a to z, A to Z and _. (or empty spaces) and is ignored."),
+            Error(CRITICAL, "Field name: ['confirmed copyright'] contains illegal name characters (or empty spaces) and is ignored."),
             Error(INFO, 'Field about_resource: Path'),
             Error(INFO, "Field ['resource', 'test'] is a custom field.")
         ]

tests/test_model.py

@@ -582,7 +582,7 @@ def test_About_rejects_non_ascii_names_and_accepts_unicode_values(self):
         test_file = get_test_loc('test_model/parse/non_ascii_field_name_value.about')
         a = model.About(test_file)
         expected = [
-            Error(CRITICAL, "Field name: ['mat\xedas'] contains illegal name characters: 0 to 9, a to z, A to Z and _. (or empty spaces) and is ignored.")
+            Error(CRITICAL, "Field name: ['mat\xedas'] contains illegal name characters (or empty spaces) and is ignored.")
         ]
         assert expected == a.errors