← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2015-01-15 12:20:11 UTC
  • mfrom: (18.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150115122011-cc7j5dhy2h9uo13m
Tags: 2.3.2+dfsg-1ubuntu1
Backport patch to support pylint3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
spyderlib/widgets/externalshell/baseshell.py
255
255
#    Input/Output
256
256
#===============================================================================
257
257
    def transcode(self, qba):
258
 
        return to_text_string( LOCALE_CODEC.toUnicode(qba.data()) )
 
258
        return to_text_string(qba.data(), 'utf8')
259
259
    
260
260
    def get_stdout(self):
261
261
        self.process.setReadChannel(QProcess.StandardOutput)
303
303
                                arguments="-q4thread -pylab -colors LightBG",
304
304
                                light_background=False)
305
305
#    shell = ExternalPythonShell(wdir=osp.dirname(spyderlib.__file__),
306
 
#                                interact=True, umd_enabled=True,
 
306
#                                interact=True, umr_enabled=True,
307
307
#                                stand_alone=settings,
308
 
#                                umd_namelist=['guidata', 'guiqwt'],
309
 
#                                umd_verbose=True, light_background=False)
 
308
#                                umr_namelist=['guidata', 'guiqwt'],
 
309
#                                umr_verbose=True, light_background=False)
310
310
#    shell = ExternalSystemShell(wdir=osp.dirname(spyderlib.__file__),
311
311
#                                light_background=False)
312
312
    shell.shell.toggle_wrap_mode(True)