Merge remote-tracking branch 'upstream/4.x' into jedi_0.17

Merge!

Author: andfoy

bootstrap.py

@@ -59,6 +59,10 @@
                     default=False, help="Disable Apport exception hook (Ubuntu)")
 parser.add_argument('--debug', action='store_true',
                   default=False, help="Run Spyder in debug mode")
+parser.add_argument('--filter-log', default='',
+                    help="Comma-separated module name hierarchies whose log "
+                         "messages should be shown. e.g., "
+                         "spyder.plugins.completion,spyder.plugins.editor")
 parser.add_argument('spyder_options', nargs='*')
 
 args = parser.parse_args()
@@ -121,6 +125,10 @@
         sys.exit("ERROR: Can't enable debug mode - Spyder is already imported")
     print("0x. Switching debug mode on")
     os.environ["SPYDER_DEBUG"] = "3"
+    if len(args.filter_log) > 0:
+        print("*. Displaying log messages only from the "
+              "following modules: {0}".format(args.filter_log))
+    os.environ["SPYDER_FILTER_LOG"] = args.filter_log
     # this way of interaction suxx, because there is no feedback
     # if operation is successful
 

spyder/__init__.py

@@ -48,7 +48,6 @@
 # Directory of the current file
 __dir__ = os.path.dirname(os.path.abspath(__file__))
 
-
 def add_to_distribution(dist):
     """Add package to py2exe/cx_Freeze distribution object
     Extension to guidata.disthelpers"""

spyder/app/cli_options.py

@@ -121,6 +121,13 @@ def get_options(argv=None):
               "in your current working directory. Default is "
               "'terminal'.")
     )
+    parser.add_argument(
+        '--filter-log',
+        default='',
+        help="Comma-separated module name hierarchies whose log "
+             "messages should be shown. e.g., "
+             "spyder.plugins.completion,spyder.plugins.editor"
+    )
     parser.add_argument(
         '--report-segfault',
         dest="report_segfault",

spyder/app/utils.py

@@ -21,6 +21,7 @@
 # Local imports
 from spyder.config.base import DEV, get_conf_path, get_debug_level
 from spyder.utils.qthelpers import file_uri
+from spyder.utils.external.dafsa.dafsa import DAFSA
 
 # For spyder-ide/spyder#7447.
 try:
@@ -29,6 +30,11 @@
     QQuickWindow = QSGRendererInterface = None
 
 
+root_logger = logging.getLogger()
+FILTER_NAMES = os.environ.get('SPYDER_FILTER_LOG', "").split(',')
+FILTER_NAMES = [f.strip() for f in FILTER_NAMES]
+
+
 def get_python_doc_path():
     """
     Return Python documentation path
@@ -77,15 +83,39 @@ def setup_logging(cli_options):
         log_level = levels[get_debug_level()]
         log_format = '%(asctime)s [%(levelname)s] [%(name)s] -> %(message)s'
 
+        console_filters = cli_options.filter_log.split(',')
+        console_filters = [x.strip() for x in console_filters]
+        console_filters = console_filters + FILTER_NAMES
+        console_filters = [x for x in console_filters if x != '']
+
+        handlers = [logging.StreamHandler()]
         if cli_options.debug_output == 'file':
             log_file = 'spyder-debug.log'
+            handlers.append(logging.FileHandler(open(log_file, 'w+')))
         else:
             log_file = None
 
-        logging.basicConfig(level=log_level,
-                            format=log_format,
-                            filename=log_file,
-                            filemode='w+')
+        match_func = lambda x: True
+        if console_filters != [''] and len(console_filters) > 0:
+            dafsa = DAFSA(console_filters)
+            match_func = lambda x: (dafsa.lookup(x, stop_on_prefix=True)
+                                    is not None)
+
+        formatter = logging.Formatter(log_format)
+
+        class ModuleFilter(logging.Filter):
+            """Filter messages based on module name prefix."""
+
+            def filter(self, record):
+                return match_func(record.name)
+
+        filter = ModuleFilter()
+        root_logger.setLevel(log_level)
+        for handler in handlers:
+            handler.addFilter(filter)
+            handler.setFormatter(formatter)
+            handler.setLevel(log_level)
+            root_logger.addHandler(handler)
 
 
 def delete_lsp_log_files():

spyder/utils/external/dafsa/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright (c) 2019-2020 Tiago Tresoldi
+# Copyright (c) 2016- Spyder Project Contributors
+#
+# Licensed under the terms of the BSD 3-clause license
+# (see LICENSE.txt in this directory for details)
+# -----------------------------------------------------------------------------
+
+"""
+DAFSA
+-----------
+
+Objects defined in this module were adapted from
+`DAFSA <https://github.com/tresoldi/dafsa>`_.
+"""
+
+__author__ = 'Tiago Tresoldi'
+__email__ = 'tresoldi@shh.mpg.de'
+__version__ = '1.0.0'