Merge remote-tracking branch 'origin/334_info_msg_count_in_error' into develop

Author: chinyeungli

src/attributecode/cmd.py

@@ -381,21 +381,24 @@ def check(location, verbose):
 
     msg_format = '%(sever)s: %(message)s'
     print_errors = []
+    number_of_errors = 0
     for severity, message in errors:
         sever = severities[severity]
+        # Only problematic_errors should be counted.
+        # Others such as INFO should not be counted as error.
+        if sever in problematic_errors:
+            number_of_errors = number_of_errors + 1
         if verbose:
             print_errors.append(msg_format % locals())
         elif sever in problematic_errors:
             print_errors.append(msg_format % locals())
 
-    number_of_errors = len(print_errors)
-
     for err in print_errors:
         print(err)
 
     if print_errors:
         click.echo('Found {} errors.'.format(number_of_errors))
-        # FIXME: not sure this is the right way to exit with a retrun code
+        # FIXME: not sure this is the right way to exit with a return code
         sys.exit(1)
     else:
         click.echo('No error found.')

thirdparty/base/idna.ABOUT

@@ -14,8 +14,8 @@ copyright: |
 
 license_expression: bsd-new and python and unicode-data-software
 
-license_file: 
-    - idna.LICENSE
-    - PSF.LICENSE
-    - unicode-data-software.LICENSE
+license_file: |
+    idna.LICENSE
+    PSF.LICENSE
+    unicode-data-software.LICENSE
 notice_file: idna.NOTICE

thirdparty/base/packaging.ABOUT

@@ -10,8 +10,8 @@ owner: Python Packaging Authority
 copyright: Copyright (c) Donald Stufft and individual contributors.
 
 license_expression: bsd-simplified or apache-2.0
-license_file: 
-    - apache-2.0.LICENSE
-    - packaging.LICENSE
+license_file: |
+    apache-2.0.LICENSE
+    packaging.LICENSE
 
 notice_file: packaging.NOTICE