Merge branch 'master' into JP-3741

CHANGES.rst

@@ -34,6 +34,8 @@ associations
 
 - Update warning message about use of paths in associations. [#8752]
 
+- Remove ``MultilineLogger`` and no longer set it as the default logger. [#8781]
+
 badpix_selfcal
 --------------
 

jwst/associations/lib/log_config.py

@@ -5,8 +5,6 @@
 from logging.config import dictConfig
 from collections import defaultdict
 
-from functools import partialmethod
-
 
 __all__ = ['log_config']
 
@@ -147,28 +145,6 @@ def format(self, record):
 }
 
 
-class MultilineLogger(logging.getLoggerClass()):
-    """Split multilines so that each line is logged separately"""
-
-    def __init__(self, *args, **kwargs):
-        super(MultilineLogger, self).__init__(*args, **kwargs)
-
-    def log(self, level, msg, *args, **kwargs):
-        if self.isEnabledFor(level):
-            for line in msg.split('\n'):
-                self._log(level, line, args, **kwargs)
-
-    debug = partialmethod(log, logging.DEBUG)
-    info = partialmethod(log, logging.INFO)
-    warning = partialmethod(log, logging.WARNING)
-    error = partialmethod(log, logging.ERROR)
-    critical = partialmethod(log, logging.CRITICAL)
-    fatal = critical
-
-
-logging.setLoggerClass(MultilineLogger)
-
-
 def log_config(name=None,
                user_name=None,
                logger_config=None,

jwst/model_blender/_schemautil.py

@@ -38,9 +38,9 @@ def callback(subschema, path, combiner, ctx, recurse):
             return  # ignore ObjectNodes
 
         # strip trailing path if there's a combiner
-        for combiner in ['anyOf', 'oneOf']:
-            if combiner in path:
-                path = path[:path.index(combiner)]
+        for schema_combiner in ['anyOf', 'oneOf']:
+            if schema_combiner in path:
+                path = path[:path.index(schema_combiner)]
                 break
 
         # construct the metadata attribute path