⏪ revert previous fix, fix tests instead, logger.level cannot be None

Ousret · Nov 25, 2021 · 1561586 · 1561586
1 parent 3be824d
commit 1561586
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/charset_normalizer/api.py b/charset_normalizer/api.py
@@ -68,7 +68,7 @@ def from_bytes(
         )
 
     if explain:
-        previous_logger_level = logger.level  # type: Optional[int]
+        previous_logger_level = logger.level  # type: int
         logger.addHandler(explain_handler)
         logger.setLevel(logging.INFO)
 
@@ -422,7 +422,7 @@ def from_bytes(
             )
             if explain:
                 logger.removeHandler(explain_handler)
-                logger.setLevel(previous_logger_level or logging.WARNING)
+                logger.setLevel(previous_logger_level)
             return CharsetMatches([results[encoding_iana]])
 
         if encoding_iana == sig_encoding:
@@ -432,7 +432,7 @@ def from_bytes(
             )
             if explain:
                 logger.removeHandler(explain_handler)
-                logger.setLevel(previous_logger_level or logging.WARNING)
+                logger.setLevel(previous_logger_level)
             return CharsetMatches([results[encoding_iana]])
 
     if len(results) == 0:
@@ -463,7 +463,7 @@ def from_bytes(
 
     if explain:
         logger.removeHandler(explain_handler)
-        logger.setLevel(previous_logger_level or logging.WARNING)
+        logger.setLevel(previous_logger_level)
 
     return results
 

diff --git a/tests/test_logging.py b/tests/test_logging.py
@@ -10,7 +10,7 @@ def setup(self):
         self.logger = logging.getLogger("charset_normalizer")
         self.logger.handlers.clear()
         self.logger.addHandler(logging.NullHandler())
-        self.logger.level = None
+        self.logger.level = logging.WARNING
 
     def test_explain_true_behavior(self, caplog):
         test_sequence = b'This is a test sequence of bytes that should be sufficient'