From 1f4339bed2655871394b749951ba2dce40f1d021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 27 Feb 2019 14:54:47 +0100
Subject: [PATCH] Fix Jupyter (#1223)

* Call PyErr_Print() in QtResImport()

* Fix Jupyter
---
 scripts/pip_requirements.txt |  1 +
 src/common/QtResImporter.cpp |  6 +++++-
 src/python/cutter.py         | 11 ++++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/pip_requirements.txt b/scripts/pip_requirements.txt
index 9a58fcd5..bb605b5d 100644
--- a/scripts/pip_requirements.txt
+++ b/scripts/pip_requirements.txt
@@ -1,2 +1,3 @@
 jupyter
 ipykernel==4.10.0
+pyzmq==17.1.2
diff --git a/src/common/QtResImporter.cpp b/src/common/QtResImporter.cpp
index b38a7195..bac04a24 100644
--- a/src/common/QtResImporter.cpp
+++ b/src/common/QtResImporter.cpp
@@ -55,9 +55,13 @@ PyObject *QtResGetCode(const char *name)
 PyObject *QtResImport(const char *name)
 {
     PyObject *codeObject = QtResGetCode(name);
-    if (!codeObject)
+    if (!codeObject) {
         return nullptr;
+    }
     PyObject *module = PyImport_ExecCodeModule(name, codeObject);
+    if (!module) {
+        PyErr_Print();
+    }
     Py_DECREF(codeObject);
     return module;
 }
diff --git a/src/python/cutter.py b/src/python/cutter.py
index 08e9159c..d8c73049 100644
--- a/src/python/cutter.py
+++ b/src/python/cutter.py
@@ -1,6 +1,13 @@
 import json
 from _cutter import *
-from CutterBindings import *
+
+try:
+    from CutterBindings import *
+
+    def core():
+        return CutterCore.instance()
+except ImportError:
+    pass
 
 
 def cmdj(command):
@@ -8,5 +15,3 @@ def cmdj(command):
     return json.loads(cmd(command))
 
 
-def core():
-    return CutterCore.instance()