Skip to content

Commit b46fadc

Browse files
committed
Merge from 2.3: Fix for issues spyder-ide#2257 and spyder-ide#2259
- Also update translations
2 parents eee7a72 + 251dc5d commit b46fadc

25 files changed

+1483
-1441
lines changed

spyderlib/ipythonconfig.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ def is_qtconsole_installed():
3434

3535
# Check if pyzmq is installed too, else, what's the point?
3636
pyzmq_installed = programs.is_module_installed('zmq', version=ZMQ_REQVER)
37-
if programs.is_module_installed('IPython.qt') and pyzmq_installed:
37+
pygments_installed = programs.is_module_installed('pygments')
38+
if programs.is_module_installed('IPython.qt') and pyzmq_installed \
39+
and pygments_installed:
3840
return True
3941
else:
4042
return False
156 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)