message: simplify handling of error levels

Instead of allowing each error level to be enabled just enable all of them
through the enable_warnings() method. This matches what the code is currently
doing (minus that one helper script) and simplifies things.

Also remove the error count, it's not used.

2 files changed, 5 insertions, 10 deletions

diff --git a/giscanner/message.py b/giscanner/message.py
index 5e26592d..c59d133f 100644
--- a/giscanner/message.py
+++ b/giscanner/message.py
@@ -95,9 +95,8 @@ class MessageLogger(object):
         self._cwd = os.getcwd()
         self._output = output
         self._namespace = namespace
-        self._enable_warnings = []
+        self._enable_warnings = False
         self._warning_count = 0
-        self._error_count = 0
 
     @classmethod
     def get(cls, *args, **kwargs):
@@ -105,15 +104,12 @@ class MessageLogger(object):
             cls._instance = cls(*args, **kwargs)
         return cls._instance
 
-    def enable_warnings(self, log_types):
-        self._enable_warnings = log_types
+    def enable_warnings(self, value):
+        self._enable_warnings = bool(value)
 
     def get_warning_count(self):
         return self._warning_count
 
-    def get_error_count(self):
-        return self._error_count
-
     def log(self, log_type, text, positions=None, prefix=None, marker_pos=None, marker_line=None):
         """
         Log a warning, using optional file positioning information.
@@ -123,7 +119,7 @@ class MessageLogger(object):
 
         self._warning_count += 1
 
-        if log_type not in self._enable_warnings:
+        if not self._enable_warnings:
             return
 
         if type(positions) == set:
@@ -142,7 +138,6 @@ class MessageLogger(object):
             error_type = "Warning"
         elif log_type == ERROR:
             error_type = "Error"
-            self._error_count += 1
         elif log_type == FATAL:
             error_type = "Fatal"
 
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 264bd517..c004fb19 100644
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -550,7 +550,7 @@ def scanner_main(args):
     namespace = create_namespace(options)
     logger = message.MessageLogger.get(namespace=namespace)
     if options.warn_all:
-        logger.enable_warnings((message.WARNING, message.ERROR, message.FATAL))
+        logger.enable_warnings(True)
 
     transformer = create_transformer(namespace, options)