Merge pull request #2881 from Qlogin/patch-1

PR: Crashing on shortcut assignment with PyQt5
spyder-ide · Apr 11, 2016 · 308e42c · 308e42c
2 parents aaa85c3 + 3214312
commit 308e42c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/spyderlib/plugins/shortcuts.py b/spyderlib/plugins/shortcuts.py
@@ -791,8 +791,13 @@ def setup_page(self):
         self.setTabOrder(self.finder, self.reset_btn)
 
         # Signals and slots
-        self.table.proxy_model.dataChanged.connect(
-                     lambda i1, i2, opt='': self.has_been_modified(opt))
+        if PYQT5:
+            # Qt5 'dataChanged' has 3 parameters
+            self.table.proxy_model.dataChanged.connect(
+                lambda i1, i2, roles, opt='': self.has_been_modified(opt))
+        else:
+            self.table.proxy_model.dataChanged.connect(
+                lambda i1, i2, opt='': self.has_been_modified(opt))
         self.reset_btn.clicked.connect(self.reset_to_default)
 
     def check_settings(self):