Merge pull request #2575 from goanpeca/config

Reorganize repo: grouped config files inside spyderlib/config

bootstrap.py

@@ -133,7 +133,7 @@
 
 if options.debug:
     # safety check - Spyder config should not be imported at this point
-    if "spyderlib.baseconfig" in sys.modules:
+    if "spyderlib.config.base" in sys.modules:
         sys.exit("ERROR: Can't enable debug mode - Spyder is already imported")
     print("0x. Switching debug mode on")
     os.environ["SPYDER_DEBUG"] = "True"

create_app.py

@@ -27,8 +27,8 @@
 from IPython.core.completerlib import module_list
 
 from spyderlib import __version__ as spy_version
-from spyderlib.config import EDIT_EXT
-from spyderlib.baseconfig import MAC_APP_NAME
+from spyderlib.config.main import EDIT_EXT
+from spyderlib.config.base import MAC_APP_NAME
 from spyderlib.utils.programs import find_program
 
 

spyderlib/baseconfig.py → spyderlib/config/base.py

@@ -242,7 +242,7 @@ def get_available_translations():
     # is added, to ensure LANGUAGE_CODES is updated.
     for lang in langs:
         if lang not in LANGUAGE_CODES:
-            error = _('Update LANGUAGE_CODES (inside baseconfig.py) if a new '
+            error = _('Update LANGUAGE_CODES (inside config/base.py) if a new '
                       'translation has been added to Spyder')
             raise Exception(error)
     return langs

spyderlib/guiconfig.py → spyderlib/config/gui.py

@@ -6,7 +6,7 @@
 
 """
 Spyder GUI-related configuration management
-(for non-GUI configuration, see spyderlib/baseconfig.py)
+(for non-GUI configuration, see spyderlib/config/base.py)
 
 Important note regarding shortcuts:
     For compatibility with QWERTZ keyboards, one must avoid using the following
@@ -19,8 +19,8 @@
 from spyderlib.qt.QtGui import QFont, QFontDatabase, QShortcut, QKeySequence
 from spyderlib.qt.QtCore import Qt
 
-from spyderlib.config import CONF
-from spyderlib.userconfig import NoDefault
+from spyderlib.config.main import CONF
+from spyderlib.config.user import NoDefault
 from spyderlib.widgets.sourcecode import syntaxhighlighters as sh
 from spyderlib.py3compat import to_text_string
 

spyderlib/ipythonconfig.py → spyderlib/config/ipython.py

@@ -10,7 +10,7 @@
 
 from spyderlib.utils import programs
 from spyderlib import dependencies
-from spyderlib.baseconfig import _
+from spyderlib.config.base import _
 
 
 IPYTHON_REQVER = '>=3.0'

spyderlib/config.py → spyderlib/config/main.py

@@ -16,9 +16,9 @@
 import os.path as osp
 
 # Local import
-from spyderlib.userconfig import UserConfig
-from spyderlib.baseconfig import (CHECK_ALL, EXCLUDED_NAMES, SUBFOLDER,
-                                  get_home_dir, _)
+from spyderlib.config.user import UserConfig
+from spyderlib.config.base import (CHECK_ALL, EXCLUDED_NAMES, SUBFOLDER,
+                                   get_home_dir, _)
 from spyderlib.utils import iofuncs, codeanalysis
 
 

spyderlib/userconfig.py → spyderlib/config/user.py

@@ -22,8 +22,8 @@
 
 # Local imports
 from spyderlib import __version__
-from spyderlib.baseconfig import (DEV, TEST, get_module_source_path,
-                                  get_home_dir)
+from spyderlib.config.base import (DEV, TEST, get_module_source_path,
+                                   get_home_dir)
 from spyderlib.utils.programs import check_version
 from spyderlib.py3compat import configparser as cp
 from spyderlib.py3compat import PY2, is_text_string, to_text_string

spyderlib/plugins/__init__.py

@@ -28,10 +28,10 @@
 
 # Local imports
 from spyderlib.utils.qthelpers import toggle_actions, get_icon, create_action
-from spyderlib.baseconfig import _
-from spyderlib.config import CONF
-from spyderlib.userconfig import NoDefault
-from spyderlib.guiconfig import get_font, set_font
+from spyderlib.config.base import _
+from spyderlib.config.main import CONF
+from spyderlib.config.user import NoDefault
+from spyderlib.config.gui import get_font, set_font
 from spyderlib.plugins.configdialog import SpyderConfigPage
 from spyderlib.py3compat import configparser, is_text_string
 

spyderlib/plugins/configdialog.py

@@ -22,12 +22,12 @@
                                  getexistingdirectory, getopenfilename)
 import spyderlib.utils.icon_manager as ima
 
-from spyderlib.baseconfig import (_, running_in_mac_app, LANGUAGE_CODES,
-                                  save_lang_conf, load_lang_conf)
-from spyderlib.config import CONF
-from spyderlib.guiconfig import (CUSTOM_COLOR_SCHEME_NAME,
-                                 set_default_color_scheme)
-from spyderlib.userconfig import NoDefault
+from spyderlib.config.base import (_, running_in_mac_app, LANGUAGE_CODES,
+                                   save_lang_conf, load_lang_conf)
+from spyderlib.config.main import CONF
+from spyderlib.config.gui import (CUSTOM_COLOR_SCHEME_NAME,
+                                  set_default_color_scheme)
+from spyderlib.config.user import NoDefault
 from spyderlib.widgets.colors import ColorLayout
 from spyderlib.widgets.sourcecode import syntaxhighlighters as sh
 from spyderlib.py3compat import to_text_string, is_text_string, getcwd

spyderlib/plugins/console.py

@@ -24,8 +24,8 @@
 
 
 # Local imports
-from spyderlib.baseconfig import _, debug_print
-from spyderlib.config import CONF
+from spyderlib.config.base import _, debug_print
+from spyderlib.config.main import CONF
 from spyderlib.utils.misc import get_error_match, remove_backslashes
 from spyderlib.utils.qthelpers import (create_action, add_actions,
                                        mimedata2url, DialogManager)

spyderlib/plugins/editor.py

@@ -30,9 +30,9 @@
 
 # Local imports
 from spyderlib.utils import encoding, sourcecode, codeanalysis
-from spyderlib.baseconfig import get_conf_path, _
-from spyderlib.config import CONF, EDIT_FILTERS, get_filter, EDIT_FILETYPES
-from spyderlib.guiconfig import get_color_scheme
+from spyderlib.config.base import get_conf_path, _
+from spyderlib.config.main import CONF, EDIT_FILTERS, get_filter, EDIT_FILETYPES
+from spyderlib.config.gui import get_color_scheme
 from spyderlib.utils import programs
 from spyderlib.utils.qthelpers import (create_action, add_actions,
                                        get_filetype_icon, add_shortcut_to_tooltip)

spyderlib/plugins/explorer.py

@@ -18,7 +18,7 @@
 import os.path as osp
 
 # Local imports
-from spyderlib.baseconfig import _
+from spyderlib.config.base import _
 from spyderlib.utils.qthelpers import create_action
 from spyderlib.widgets.explorer import ExplorerWidget
 from spyderlib.plugins import SpyderPluginMixin

spyderlib/plugins/externalconsole.py

@@ -29,8 +29,8 @@
 import subprocess
 
 # Local imports
-from spyderlib.baseconfig import SCIENTIFIC_STARTUP, running_in_mac_app, _
-from spyderlib.config import CONF
+from spyderlib.config.base import SCIENTIFIC_STARTUP, running_in_mac_app, _
+from spyderlib.config.main import CONF
 from spyderlib.utils import encoding, programs
 from spyderlib.utils.misc import (get_error_match, get_python_executable,
                                   remove_backslashes, is_python_script)

spyderlib/plugins/findinfiles.py

@@ -16,7 +16,7 @@
 import spyderlib.utils.icon_manager as ima
 
 # Local imports
-from spyderlib.baseconfig import _
+from spyderlib.config.base import _
 from spyderlib.utils.qthelpers import create_action
 from spyderlib.widgets.findinfiles import FindInFilesWidget
 from spyderlib.plugins import SpyderPluginMixin

spyderlib/plugins/history.py

@@ -18,9 +18,9 @@
 
 # Local imports
 from spyderlib.utils import encoding
-from spyderlib.baseconfig import _
-from spyderlib.config import CONF
-from spyderlib.guiconfig import get_color_scheme
+from spyderlib.config.base import _
+from spyderlib.config.main import CONF
+from spyderlib.config.gui import get_color_scheme
 from spyderlib.utils.qthelpers import (create_action, create_toolbutton, add_actions)
 from spyderlib.widgets.tabs import Tabs
 from spyderlib.widgets.sourcecode import codeeditor

spyderlib/plugins/inspector.py

@@ -22,10 +22,10 @@
 
 # Local imports
 from spyderlib import dependencies
-from spyderlib.baseconfig import get_conf_path, get_module_source_path, _
-from spyderlib.ipythonconfig import IPYTHON_QT_INSTALLED
-from spyderlib.config import CONF
-from spyderlib.guiconfig import get_color_scheme, get_font, set_font
+from spyderlib.config.base import get_conf_path, get_module_source_path, _
+from spyderlib.config.ipython import IPYTHON_QT_INSTALLED
+from spyderlib.config.main import CONF
+from spyderlib.config.gui import get_color_scheme, get_font, set_font
 from spyderlib.utils import programs
 from spyderlib.utils.qthelpers import (create_toolbutton, add_actions,
                                        create_action)

spyderlib/plugins/ipythonconsole.py

@@ -46,8 +46,8 @@
 
 # Local imports
 from spyderlib import dependencies
-from spyderlib.baseconfig import _
-from spyderlib.config import CONF
+from spyderlib.config.base import _
+from spyderlib.config.main import CONF
 from spyderlib.utils.misc import get_error_match, remove_backslashes
 from spyderlib.utils import programs
 from spyderlib.utils.qthelpers import create_action

spyderlib/plugins/layoutdialog.py

@@ -8,7 +8,7 @@
 
 import sys
 
-from spyderlib.baseconfig import _
+from spyderlib.config.base import _
 
 from spyderlib.qt.QtGui import (QVBoxLayout, QHBoxLayout, QDialogButtonBox,
                                 QGroupBox, QComboBox, QPushButton, QDialog,

spyderlib/plugins/onlinehelp.py

@@ -11,7 +11,7 @@
 import os.path as osp
 
 # Local imports
-from spyderlib.baseconfig import get_conf_path, _
+from spyderlib.config.base import get_conf_path, _
 from spyderlib.widgets.pydocgui import PydocBrowser
 from spyderlib.plugins import SpyderPluginMixin
 from spyderlib.py3compat import to_text_string

spyderlib/plugins/outlineexplorer.py

@@ -14,7 +14,7 @@
 from spyderlib.qt.QtCore import Signal
 
 # Local imports
-from spyderlib.baseconfig import _
+from spyderlib.config.base import _
 from spyderlib.widgets.editortools import OutlineExplorerWidget
 from spyderlib.plugins import SpyderPluginMixin
 from spyderlib.py3compat import is_text_string

spyderlib/plugins/projectexplorer.py

@@ -11,7 +11,7 @@
 import spyderlib.utils.icon_manager as ima
 
 # Local imports
-from spyderlib.baseconfig import _
+from spyderlib.config.base import _
 from spyderlib.utils.qthelpers import create_action
 from spyderlib.widgets.projectexplorer import ProjectExplorerWidget
 from spyderlib.plugins import SpyderPluginMixin

spyderlib/plugins/runconfig.py

@@ -19,8 +19,8 @@
 import os.path as osp
 
 # Local imports
-from spyderlib.baseconfig import _
-from spyderlib.config import CONF
+from spyderlib.config.base import _
+from spyderlib.config.main import CONF
 from spyderlib.plugins.configdialog import GeneralConfigPage
 from spyderlib.py3compat import to_text_string, getcwd
 

spyderlib/plugins/shortcuts.py

@@ -21,9 +21,9 @@
 from spyderlib.qt.compat import to_qvariant, from_qvariant
 
 # Local imports
-from spyderlib.baseconfig import _, debug_print
-from spyderlib.guiconfig import (get_shortcut, set_shortcut,
-                                 iter_shortcuts, reset_shortcuts)
+from spyderlib.config.base import _, debug_print
+from spyderlib.config.gui import (get_shortcut, set_shortcut,
+                                  iter_shortcuts, reset_shortcuts)
 from spyderlib.plugins.configdialog import GeneralConfigPage
 from spyderlib.utils import icon_manager as ima
 from spyderlib.utils.qthelpers import get_std_icon

spyderlib/plugins/variableexplorer.py

@@ -11,8 +11,8 @@
 import spyderlib.utils.icon_manager as ima
 
 # Local imports
-from spyderlib.baseconfig import _
-from spyderlib.config import CONF
+from spyderlib.config.base import _
+from spyderlib.config.main import CONF
 from spyderlib.utils import programs
 from spyderlib.plugins import SpyderPluginMixin, PluginConfigPage
 from spyderlib.widgets.externalshell.monitor import REMOTE_SETTINGS

spyderlib/plugins/workingdirectory.py

@@ -23,7 +23,7 @@
 
 # Local imports
 from spyderlib.utils import encoding
-from spyderlib.baseconfig import get_conf_path, _
+from spyderlib.config.base import get_conf_path, _
 from spyderlib.utils.qthelpers import create_action
 
 # Package local imports

spyderlib/restart_app.py

@@ -20,7 +20,7 @@
 import time
 
 
-from spyderlib.baseconfig import _, get_image_path
+from spyderlib.config.base import _, get_image_path
 from spyderlib.py3compat import to_text_string
 from spyderlib.qt.QtCore import Qt, QTimer
 from spyderlib.qt.QtGui import (QColor, QMessageBox, QPixmap, QSplashScreen,

spyderlib/rope_patch.py

@@ -37,13 +37,13 @@ def apply():
 
     # [1] Patching project.Project for compatibility with py2exe/cx_Freeze
     #     distributions
-    from spyderlib.baseconfig import is_py2exe_or_cx_Freeze
+    from spyderlib.config.base import is_py2exe_or_cx_Freeze
     if is_py2exe_or_cx_Freeze():
         from rope.base import project
         class PatchedProject(project.Project):
             def _default_config(self):
                 # py2exe/cx_Freeze distribution
-                from spyderlib.baseconfig import get_module_source_path
+                from spyderlib.config.base import get_module_source_path
                 fname = get_module_source_path('spyderlib',
                                                'default_config.py')
                 return open(fname, 'rb').read()

spyderlib/spyder.py

@@ -103,7 +103,7 @@
 #==============================================================================
 # Create splash screen out of MainWindow to reduce perceived startup time. 
 #==============================================================================
-from spyderlib.baseconfig import _, get_image_path, DEV
+from spyderlib.config.base import _, get_image_path, DEV
 SPLASH = QSplashScreen(QPixmap(get_image_path('splash.png'), 'png'))
 SPLASH_FONT = SPLASH.font()
 SPLASH_FONT.setPixelSize(10)
@@ -118,15 +118,15 @@
 # Local utility imports
 #==============================================================================
 from spyderlib import __version__, __project_url__, __forum_url__, get_versions
-from spyderlib.baseconfig import (get_conf_path, get_module_data_path,
-                                  get_module_source_path, STDERR, DEBUG,
-                                  debug_print, TEST, SUBFOLDER, MAC_APP_NAME,
-                                  running_in_mac_app, get_module_path)
-from spyderlib.config import CONF, EDIT_EXT, IMPORT_EXT, OPEN_FILES_PORT
+from spyderlib.config.base import (get_conf_path, get_module_data_path,
+                                   get_module_source_path, STDERR, DEBUG,
+                                   debug_print, TEST, SUBFOLDER, MAC_APP_NAME,
+                                   running_in_mac_app, get_module_path)
+from spyderlib.config.main import CONF, EDIT_EXT, IMPORT_EXT, OPEN_FILES_PORT
 from spyderlib.cli_options import get_options
 from spyderlib import dependencies
-from spyderlib.ipythonconfig import IPYTHON_QT_INSTALLED
-from spyderlib.userconfig import NoDefault
+from spyderlib.config.ipython import IPYTHON_QT_INSTALLED
+from spyderlib.config.user import NoDefault
 from spyderlib.utils import encoding, programs
 from spyderlib.utils.iofuncs import load_session, save_session, reset_session
 from spyderlib.utils.programs import is_module_installed
@@ -153,7 +153,7 @@
                                        create_program_action, DialogManager,
                                        keybinding, create_python_script_action,
                                        file_uri)
-from spyderlib.guiconfig import get_shortcut, remove_deprecated_shortcuts
+from spyderlib.config.gui import get_shortcut, remove_deprecated_shortcuts
 from spyderlib.otherplugins import get_spyderplugins_mods
 from spyderlib import tour # FIXME: Better place for this?
 

spyderlib/start_app.py

@@ -11,9 +11,8 @@
 
 # Local imports
 from spyderlib.cli_options import get_options
-from spyderlib.baseconfig import get_conf_path, running_in_mac_app
-from spyderlib.config import CONF
-from spyderlib.baseconfig import DEV, TEST
+from spyderlib.config.base import get_conf_path, running_in_mac_app, DEV, TEST
+from spyderlib.config.main import CONF
 from spyderlib.utils.external import lockfile
 from spyderlib.py3compat import is_unicode
 
@@ -55,7 +54,7 @@ def main():
     options to the application.
     """
     # Renaming old configuration files (the '.' prefix has been removed)
-    # (except for .spyder.ini --> spyder.ini, which is done in userconfig.py)
+    # (except for .spyder.ini --> spyder.ini, which is done in config/user.py)
     if DEV is None:
         cpath = get_conf_path()
         for fname in os.listdir(cpath):

spyderlib/tour.py

@@ -25,7 +25,7 @@
                                  QPropertyAnimation, QEasingCurve)
 
 # Local import
-from spyderlib.baseconfig import _, get_image_path
+from spyderlib.config.base import _, get_image_path
 from spyderlib.utils.qthelpers import (create_action, add_actions)
 
 # FIXME: Known issues

spyderlib/utils/bsdsocket.py

@@ -18,7 +18,7 @@
 import traceback
 
 # Local imports
-from spyderlib.baseconfig import DEBUG, STDERR
+from spyderlib.config.base import DEBUG, STDERR
 DEBUG_EDITOR = DEBUG >= 3
 from spyderlib.py3compat import pickle
 PICKLE_HIGHEST_PROTOCOL = 2