MRG, BUG: Force keywords for verbose in short sigs

doc/changes/latest.inc

@@ -46,6 +46,8 @@ Bugs
 
 - Fix bug with :func:`mne.add_reference_channels` when :func:`mne.io.Raw.reorder_channels` or related methods are used afterward by `Eric Larson`_ (:gh:`8303`)
 
+- Fix bug where the ``verbose`` arguments to :meth:`mne.Evoked.apply_baseline` and :meth:`mne.Epochs.apply_baseline` were not keyword-only by `Eric Larson`_ (:gh:`8349`)
+
 - ``ICA.max_pca_components`` will not be altered by calling `~mne.preprocessing.ICA.fit` anymore. Instead, the new attribute ``ICA.max_pca_components_`` will be set, by `Richard Höchenberger`_ (:gh:`8321`)
 
 - Fix bug that `~mne.viz.plot_ica_overlay` would sometimes not create red traces, by `Richard Höchenberger`_ (:gh:`8341`)

mne/epochs.py

@@ -636,7 +636,7 @@ def decimate(self, decim, offset=0, verbose=None):
         return self
 
     @verbose
-    def apply_baseline(self, baseline=(None, 0), verbose=None):
+    def apply_baseline(self, baseline=(None, 0), *, verbose=None):
         """Baseline correct epochs.
 
         Parameters

mne/evoked.py

@@ -151,7 +151,7 @@ def data(self, data):
         self._data = data
 
     @verbose
-    def apply_baseline(self, baseline=(None, 0), verbose=None):
+    def apply_baseline(self, baseline=(None, 0), *, verbose=None):
         """Baseline correct evoked data.
 
         Parameters

mne/utils/_logging.py

@@ -97,33 +97,35 @@ def verbose(function):
     # Anything using verbose should either have `verbose=None` in the signature
     # or have a `self.verbose` attribute (if in a method). This code path
     # will raise an error if neither is the case.
-    wrap_src = """\
-try:
-    verbose
-except UnboundLocalError:
+    body = """\
+def %(name)s(%(signature)s):\n
     try:
-        verbose = self.verbose
-    except NameError:
-        raise RuntimeError('Function %%s does not accept verbose parameter'
-                           %% (_function_,))
-    except AttributeError:
-        raise RuntimeError('Method %%s class does not have self.verbose'
-                           %% (_function_,))
-if verbose is None:
-    try:
-        verbose = self.verbose
-    except (NameError, AttributeError):
-        pass
-if verbose is not None:
-    with _use_log_level_(verbose):
-        return _function_(%(signature)s)
-return _function_(%(signature)s)"""
+        verbose
+    except UnboundLocalError:
+        try:
+            verbose = self.verbose
+        except NameError:
+            raise RuntimeError('Function %%s does not accept verbose parameter'
+                               %% (_function_,))
+        except AttributeError:
+            raise RuntimeError('Method %%s class does not have self.verbose'
+                               %% (_function_,))
+    else:
+        if verbose is None:
+            try:
+                verbose = self.verbose
+            except (NameError, AttributeError):
+                pass
+    if verbose is not None:
+        with _use_log_level_(verbose):
+            return _function_(%(shortsignature)s)
+    else:
+        return _function_(%(shortsignature)s)"""
     evaldict = dict(
         _use_log_level_=use_log_level, _function_=function)
-    return FunctionMaker.create(
-        function, wrap_src, evaldict,
-        __wrapped__=function, __qualname__=function.__qualname__,
-        module=function.__module__)
+    fm = FunctionMaker(function, None, None, None, None, function.__module__)
+    attrs = dict(__wrapped__=function, __qualname__=function.__qualname__)
+    return fm.make(body, evaldict, addsource=True, **attrs)
 
 
 class use_log_level(object):
@@ -175,7 +177,8 @@ def set_log_level(verbose=None, return_old_level=False, add_frames=None):
         The old level. Only returned if ``return_old_level`` is True.
     """
     from .config import get_config
-    from .check import _check_option
+    from .check import _check_option, _validate_type
+    _validate_type(verbose, (bool, str, int, None), 'verbose')
     if verbose is None:
         verbose = get_config('MNE_LOGGING_LEVEL', 'INFO')
     elif isinstance(verbose, bool):

mne/utils/docs.py

@@ -27,7 +27,8 @@
 docdict['verbose'] = """
 verbose : bool, str, int, or None
     If not None, override default verbose level (see :func:`mne.verbose`
-    and :ref:`Logging documentation <tut_logging>` for more)."""
+    and :ref:`Logging documentation <tut_logging>` for more).
+    If used, it should be passed as a keyword-argument only."""
 docdict['verbose_meth'] = (docdict['verbose'] + ' Defaults to self.verbose.')
 
 # Preload

mne/utils/tests/test_docs.py

@@ -13,7 +13,7 @@ def test_doc_filling(obj):
     doc = obj.__doc__
     assert 'verbose : ' in doc
     if obj is add_channels_epochs:
-        assert 'for more). Defaults to True if' in doc
+        assert 'keyword-argument only. Defaults to True if' in doc
 
 
 def test_deprecated_alias():