[MRG] moving logging.py _logging.py (#5871)

* moving logging.py _logging.py

* FIX: More general warn

Author: agramfort

mne/utils/__init__.py

@@ -18,9 +18,9 @@
 from .docs import (copy_function_doc_to_method_doc, copy_doc, linkcode_resolve,
                    open_docs, deprecated)
 from .fetching import _fetch_file, _url_to_local_path
-from .logging import (verbose, logger, set_log_level, set_log_file,
-                      use_log_level, catch_logging, warn, filter_out_warnings,
-                      ETSContext)
+from ._logging import (verbose, logger, set_log_level, set_log_file,
+                       use_log_level, catch_logging, warn, filter_out_warnings,
+                       ETSContext)
 from .misc import (run_subprocess, _pl, _clean_names, _Counter, pformat,
                    _explain_exception, _get_argvalues, sizeof_fmt)
 from .progressbar import ProgressBar

mne/utils/logging.py renamed to mne/utils/_logging.py

@@ -246,12 +246,10 @@ def warn(message, category=RuntimeWarning, module='mne'):
             fname = frame.f_code.co_filename
             lineno = frame.f_lineno
             # in verbose dec
-            if fname == '<string>' and last_fname == 'logging.py':
+            if fname == '<string>' and last_fname == op.basename(__file__):
                 last_fname = fname
                 frame = frame.f_back
                 continue
-            if fname == '<string>':
-                raise RuntimeError
             # treat tests as scripts
             # and don't capture unittest/case.py (assert_raises)
             if not (fname.startswith(root_dir) or

mne/utils/check.py

@@ -11,7 +11,7 @@
 
 import numpy as np
 
-from .logging import warn
+from ._logging import warn
 
 
 def _ensure_int(x, name='unknown', must_be='an int'):

mne/utils/config.py

@@ -20,7 +20,7 @@
 import numpy as np
 
 from .check import _validate_type
-from .logging import warn, logger
+from ._logging import warn, logger
 
 
 _temp_home_dir = None

mne/utils/fetching.py

@@ -13,7 +13,7 @@
 from .progressbar import ProgressBar
 from .numerics import hashfunc
 from .misc import sizeof_fmt
-from .logging import warn, logger, verbose
+from ._logging import warn, logger, verbose
 
 
 def _get_http(url, temp_file_name, initial_size, file_size, timeout,

mne/utils/misc.py

@@ -18,7 +18,7 @@
 import numpy as np
 
 from ..fixes import _get_args
-from .logging import logger, verbose, warn
+from ._logging import logger, verbose, warn
 
 
 def _pl(x, non_pl=''):

mne/utils/mixin.py

@@ -13,7 +13,7 @@
 import numpy as np
 
 from .check import _check_pandas_installed, _check_preload, _validate_type
-from .logging import warn, verbose
+from ._logging import warn, verbose
 from .numerics import object_size, object_hash
 
 

mne/utils/numerics.py

@@ -14,7 +14,7 @@
 import numpy as np
 from scipy import linalg, sparse
 
-from .logging import logger, warn
+from ._logging import logger, warn
 from .check import check_random_state, _ensure_int, _validate_type
 from .docs import deprecated
 

mne/utils/progressbar.py

@@ -15,7 +15,7 @@
 
 import numpy as np
 
-from .logging import logger
+from ._logging import logger
 from .misc import sizeof_fmt
 
 

mne/utils/testing.py

@@ -20,7 +20,7 @@
 
 import numpy as np
 
-from .logging import warn
+from ._logging import warn
 
 
 def _memory_usage(*args, **kwargs):