Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix arrayeditor import error in PyQt5 #2767

Merged
merged 1 commit into from
Oct 13, 2015
+6 −3
Merged

Fix arrayeditor import error in PyQt5 #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions spyderlib/qt/QtCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions spyderlib/qt/QtGui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions spyderlib/widgets/varexp/arrayeditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down