Remove logging.NullHandler definitions as we no longer support 2.7

DataONEorg · Apr 4, 2019 · 7242893 · 7242893
1 parent f8b18cb
commit 7242893
Show file tree

Hide file tree

Showing 24 changed files with 72 additions and 360 deletions.
diff --git a/client_cli/__init__.py b/client_cli/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/client_cli/src/d1_cli/__init__.py b/client_cli/src/d1_cli/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/client_onedrive/__init__.py b/client_onedrive/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/client_onedrive/src/d1_onedrive/impl/tests/__init__.py b/client_onedrive/src/d1_onedrive/impl/tests/__init__.py
@@ -24,19 +24,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/dev_tools/__init__.py b/dev_tools/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/dev_tools/src/d1_dev/__init__.py b/dev_tools/src/d1_dev/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/gmn/__init__.py b/gmn/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/gmn/src/__init__.py b/gmn/src/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_client/__init__.py b/lib_client/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_client/src/d1_client/__init__.py b/lib_client/src/d1_client/__init__.py
@@ -36,19 +36,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_client/src/d1_client/iter/__init__.py b/lib_client/src/d1_client/iter/__init__.py
@@ -23,19 +23,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_common/__init__.py b/lib_common/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_common/src/__init__.py b/lib_common/src/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_common/src/d1_common/__init__.py b/lib_common/src/d1_common/__init__.py
@@ -22,19 +22,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_common/src/d1_common/cert/__init__.py b/lib_common/src/d1_common/cert/__init__.py
@@ -24,19 +24,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_common/src/d1_common/iter/__init__.py b/lib_common/src/d1_common/iter/__init__.py
@@ -25,19 +25,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lib_common/src/d1_common/types/__init__.py b/lib_common/src/d1_common/types/__init__.py
@@ -63,19 +63,7 @@
 
 """
 
+# Suppress log messages instead of raising exception if the program using the library
+# does not configure the logging system.
 import logging
-
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        """Suppress log messages instead of raising exception if the program using the
-        library does not configure the logging system."""
-
-        # noinspection PyMissingOrEmptyDocstring
-        def emit(self, record):
-            pass
-
-
-logging.getLogger(__name__).addHandler(NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())