← Back to branch summary

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

« back to all changes in this revision

Viewing changes to spyderlib/ipythonconfig.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/ipythonconfig.py
12
12
 
13
13
 
14
14
def is_qtconsole_installed():
15
 
    if programs.is_module_installed('IPython.qt'):
 
15
    pyzmq_installed = programs.is_module_installed('zmq')
 
16
    if programs.is_module_installed('IPython.qt') and pyzmq_installed:
16
17
        return True
17
 
    elif programs.is_module_installed('IPython.frontend.qt'):
 
18
    elif programs.is_module_installed('IPython.frontend.qt') and \
 
19
      pyzmq_installed:
18
20
        return True
19
21
    else:
20
22
        return False