Merge pull request #2767 from flying-sheep/QItemSelection

Fix arrayeditor import error in PyQt5
spyder-ide · Oct 13, 2015 · 1b6b7ed · 1b6b7ed
2 parents d029db4 + b27bf72
commit 1b6b7ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/spyderlib/qt/QtCore.py b/spyderlib/qt/QtCore.py
@@ -21,6 +21,8 @@
     from PyQt4.QtCore import pyqtSlot as Slot                 # analysis:ignore
     from PyQt4.QtCore import pyqtProperty as Property         # analysis:ignore
     from PyQt4.QtCore import QT_VERSION_STR as __version__    # analysis:ignore
+
+    from PyQt4.QtGui import QItemSelection, QItemSelectionRange  # analysis:ignore
 else:
     import PySide.QtCore
     __version__ = PySide.QtCore.__version__                   # analysis:ignore

diff --git a/spyderlib/qt/QtGui.py b/spyderlib/qt/QtGui.py
@@ -17,6 +17,7 @@
     from PyQt4.Qt import QKeySequence, QTextCursor            # analysis:ignore
     from PyQt4.QtGui import *                                 # analysis:ignore
     QStyleOptionViewItem = QStyleOptionViewItemV4             # analysis:ignore
+    del QItemSelection, QItemSelectionRange                   # analysis:ignore
 else:
     from PySide.QtGui import *                                # analysis:ignore
     QStyleOptionViewItem = QStyleOptionViewItemV4             # analysis:ignore
diff --git a/spyderlib/widgets/varexp/arrayeditor.py b/spyderlib/widgets/varexp/arrayeditor.py
@@ -21,9 +21,9 @@
                                 QMessageBox, QPushButton, QInputDialog, QMenu,
                                 QApplication, QKeySequence, QLabel, QComboBox,
                                 QSpinBox, QStackedWidget, QWidget, QVBoxLayout,
-                                QAbstractItemDelegate, QItemSelection,
-                                QItemSelectionRange)
-from spyderlib.qt.QtCore import (Qt, QModelIndex, QAbstractTableModel, Slot)
+                                QAbstractItemDelegate)
+from spyderlib.qt.QtCore import (Qt, QModelIndex, QAbstractTableModel, Slot,
+                                 QItemSelection, QItemSelectionRange)
 
 from spyderlib.qt.compat import to_qvariant, from_qvariant
 import spyderlib.utils.icon_manager as ima