Merge pull request #1310 from ByteOfBrie/fix-ipython-import

Fix ipython import
olivierkes · Aug 11, 2024 · e66db6b · e66db6b
2 parents 50b9fd4 + 92417c6
commit e66db6b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/manuskript/main.py b/manuskript/main.py
@@ -201,11 +201,14 @@ def launch(arguments, app, MW = None):
     # Support for IPython Jupyter QT Console as a debugging aid.
     # Last argument must be --console to enable it
     # Code reference :
-    # https://github.com/ipython/ipykernel/blob/master/examples/embedding/ipkernel_qtapp.py
-    # https://github.com/ipython/ipykernel/blob/master/examples/embedding/internal_ipkernel.py
+    # https://github.com/ipython/ipykernel/blob/main/examples/embedding/ipkernel_qtapp.py
+    # https://github.com/ipython/ipykernel/blob/main/examples/embedding/internal_ipkernel.py
     if arguments.console:
         try:
-            from IPython.lib.kernel import connect_qtconsole
+            try:
+                from IPython.lib.kernel import connect_qtconsole
+            except ImportError:
+                from ipykernel import connect_qtconsole
             from ipykernel.kernelapp import IPKernelApp
             # Only to ensure matplotlib QT mainloop integration is available
             import matplotlib