Merge from 3.x: PR #4713

Fixes #4524
spyder-ide · Jul 7, 2017 · 1dd7162 · 1dd7162
2 parents 5774d43 + baee475
commit 1dd7162
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 3,373 deletions.
diff --git a/spyder/config/main.py b/spyder/config/main.py
@@ -137,27 +137,6 @@
               'umr/verbose': True,
               'umr/namelist': [],
               }),
-            ('console',
-             {
-              'max_line_count': 500,
-              'wrap': True,
-              'single_tab': True,
-              'calltips': True,
-              'codecompletion/auto': True,
-              'codecompletion/enter_key': True,
-              'codecompletion/case_sensitive': True,
-              'show_elapsed_time': False,
-              'show_icontext': False,
-              'monitor/enabled': True,
-              'qt/api': 'default',
-              'matplotlib/backend/value': 0,
-              'light_background': True,
-              'merge_output_channels': os.name != 'nt',
-              'colorize_sys_stderr': os.name != 'nt',
-              'pythonstartup/default': True,
-              'pythonstartup/custom': False,
-              'ets_backend': 'qt4'
-              }),
             ('ipython_console',
              {
               'show_banner': True,
@@ -659,7 +638,7 @@
 #    or if you want to *rename* options, then you need to do a MAJOR update in
 #    version, e.g. from 3.0.0 to 4.0.0
 # 3. You don't need to touch this value if you're just adding a new option
-CONF_VERSION = '37.2.0'
+CONF_VERSION = '38.0.0'
 
 # Main configuration instance
 try:

diff --git a/spyder/plugins/externalconsole.py b/spyder/plugins/externalconsole.py
diff --git a/spyder/utils/inputhooks.py b/spyder/utils/inputhooks.py
diff --git a/spyder/utils/ipython/kernelspec.py b/spyder/utils/ipython/kernelspec.py
@@ -97,7 +97,6 @@ def env(self):
                 CONF.set('main_interpreter', 'umr/namelist', umr_namelist)
 
         env_vars = {
-            'IPYTHON_KERNEL': 'True',
             'EXTERNAL_INTERPRETER': not default_interpreter,
             'UMR_ENABLED': CONF.get('main_interpreter', 'umr/enabled'),
             'UMR_VERBOSE': CONF.get('main_interpreter', 'umr/verbose'),