← Back to branch summary

~ubuntu-branches/ubuntu/wily/spyder/wily-proposed

« back to all changes in this revision

Viewing changes to spyderlib/widgets/externalshell/pythonshell.py

  • Committer: Package Import Robot
  • Author(s): Ghislain Antony Vaillant, Ghislain Antony Vaillant, Picca Frédéric-Emmanuel
  • Date: 2014-10-19 11:42:57 UTC
  • mfrom: (1.2.8)
  • Revision ID: package-import@ubuntu.com-20141019114257-st1rz4fmmscgphhm
Tags: 2.3.1+dfsg-1
http://bugs.debian.org/765963
* Team upload

[Ghislain Antony Vaillant]
* New upstream release. (Closes: #765963)
* Bump Standards-Version to 3.9.6 (no changes required).
* d/control: fix pedantic lintian warning regarding capitalization in
  packages' description.

[Picca Frédéric-Emmanuel]
* Update the homepage now that upstream moved to bitbucket.
* debian/copyright
  - updated for 2.3.1 version
* debian/control
  + Recommends: python-pandas and python3-pandas

Show diffs side-by-side

added added

removed removed

Lines of Context:
spyderlib/widgets/externalshell/pythonshell.py
158
158
                 ipykernel=False, arguments='', stand_alone=None,
159
159
                 umd_enabled=True, umd_namelist=[], umd_verbose=True,
160
160
                 pythonstartup=None, pythonexecutable=None,
161
 
                 monitor_enabled=True, mpl_patch_enabled=True,
162
 
                 mpl_backend=None, ets_backend='qt4', qt_api=None, pyqt_api=0,
163
 
                 install_qt_inputhook=True, ignore_sip_setapi_errors=False,
164
 
                 merge_output_channels=False, colorize_sys_stderr=False,
165
 
                 autorefresh_timeout=3000, autorefresh_state=True,
166
 
                 light_background=True, menu_actions=None,
167
 
                 show_buttons_inside=True, show_elapsed_time=True):
 
161
                 monitor_enabled=True, mpl_backend=None, ets_backend='qt4',
 
162
                 qt_api=None, pyqt_api=0, install_qt_inputhook=True,
 
163
                 ignore_sip_setapi_errors=False, merge_output_channels=False,
 
164
                 colorize_sys_stderr=False, autorefresh_timeout=3000,
 
165
                 autorefresh_state=True, light_background=True,
 
166
                 menu_actions=None, show_buttons_inside=True,
 
167
                 show_elapsed_time=True):
168
168
 
169
169
        assert qt_api in (None, 'pyqt', 'pyside')
170
170
 
173
173
        self.dialog_manager = DialogManager()
174
174
        
175
175
        self.stand_alone = stand_alone # stand alone settings (None: plugin)
 
176
        self.interact = interact
 
177
        self.is_ipykernel = ipykernel
176
178
        self.pythonstartup = pythonstartup
177
179
        self.pythonexecutable = pythonexecutable
178
180
        self.monitor_enabled = monitor_enabled
179
 
        self.mpl_patch_enabled = mpl_patch_enabled
180
181
        self.mpl_backend = mpl_backend
181
182
        self.ets_backend = ets_backend
182
183
        self.qt_api = qt_api
190
191
        self.umd_verbose = umd_verbose
191
192
        self.autorefresh_timeout = autorefresh_timeout
192
193
        self.autorefresh_state = autorefresh_state
193
 
        self.is_ipykernel = ipykernel
194
194
                
195
195
        self.namespacebrowser_button = None
196
196
        self.cwd_button = None
221
221
        self.connection_file = None
222
222
 
223
223
        if self.is_ipykernel:
224
 
            interact = False
 
224
            self.interact = False
225
225
            # Running our custom startup script for IPython kernels:
226
226
            # (see spyderlib/widgets/externalshell/start_ipython_kernel.py)
227
227
            self.fname = get_module_source_path(
230
230
        self.shell.set_externalshell(self)
231
231
 
232
232
        self.toggle_globals_explorer(False)
233
 
        self.interact_action.setChecked(interact)
 
233
        self.interact_action.setChecked(self.interact)
234
234
        self.debug_action.setChecked(debug)
235
235
        
236
236
        self.introspection_socket = None
439
439
        
440
440
        # External modules options
441
441
        env.append('ETS_TOOLKIT=%s' % self.ets_backend)
442
 
        env.append('MATPLOTLIB_PATCH=%r' % self.mpl_patch_enabled)
443
442
        if self.mpl_backend:
444
443
            env.append('MATPLOTLIB_BACKEND=%s' % self.mpl_backend)
445
444
        if self.qt_api:
461
460
            env.append('UMD_ENABLED=%r' % self.umd_enabled)
462
461
            env.append('UMD_NAMELIST=%s' % ','.join(self.umd_namelist))
463
462
            env.append('UMD_VERBOSE=%r' % self.umd_verbose)
 
463
            env.append('MATPLOTLIB_ION=True')
 
464
        else:
 
465
            if self.interact:
 
466
                env.append('MATPLOTLIB_ION=True')
 
467
            else:
 
468
                env.append('MATPLOTLIB_ION=False')
464
469
 
465
470
        # IPython kernel
466
471
        env.append('IPYTHON_KERNEL=%r' % self.is_ipykernel)