FIX: A couple more

mne/channels/montage.py

@@ -383,7 +383,7 @@ def add_estimated_fiducials(self, subject, subjects_dir=None,
         and then use ``montage.get_native_head_t()`` to get the
         head <-> MRI transform.
         """
-        from ..source_space import get_mni_fiducials
+        from .._freesurfer import get_mni_fiducials
         # get coordframe and fiducial coordinates
         montage_bunch = _get_data_as_dict_from_dig(self.dig)
 

mne/commands/mne_setup_forward_model.py

@@ -12,7 +12,7 @@
 import sys
 import os
 import mne
-from mne.utils import warn, get_subject_dir
+from mne.utils import warn, get_subjects_dir
 
 
 def run():

mne/source_space.py

@@ -30,8 +30,10 @@
                       _normalize_vectors, _triangle_neighbors, mesh_dist,
                       complete_surface_info, _compute_nearest, fast_cross_3d,
                       _CheckInside)
+# keep get_mni_fiducials here just for easy backward compat
 from ._freesurfer import (_get_mri_info_data, _get_atlas_values,
-                          read_freesurfer_lut)
+                          read_freesurfer_lut,
+                          get_mni_fiducials)  # noqa: F401
 from .utils import (check_fname, logger, verbose, fill_doc,
                     _ensure_int, check_version, _get_call_line, warn,
                     _check_fname, _check_path_like, _check_sphere,

mne/tests/test_label.py

@@ -18,10 +18,11 @@
                  read_source_spaces, grow_labels, read_labels_from_annot,
                  write_labels_to_annot, split_label, spatial_tris_adjacency,
                  read_surface, random_parcellation, morph_labels,
-                 labels_to_stc, get_subjects_dir)
+                 labels_to_stc)
 from mne.label import (Label, _blend_colors, label_sign_flip, _load_vert_pos,
                        select_sources, find_pos_in_annot)
-from mne.utils import requires_sklearn, check_version, requires_nibabel
+from mne.utils import (requires_sklearn, check_version, requires_nibabel,
+                       get_subjects_dir)
 from mne.label import _n_colors, _read_annot, _read_annot_cands
 from mne.source_space import SourceSpaces
 from mne.source_estimate import mesh_edges