diff --git a/pandas/sandbox/qtpandas.py b/pandas/sandbox/qtpandas.py index 3f284990efd40..3c4e3d46196dc 100644 --- a/pandas/sandbox/qtpandas.py +++ b/pandas/sandbox/qtpandas.py @@ -4,14 +4,19 @@ @author: Jev Kuznetsov ''' try: - from PyQt4.QtCore import QAbstractTableModel, Qt, QVariant, QModelIndex - from PyQt4.QtGui import ( + from PyQt5.QtCore import QAbstractTableModel, Qt, QVariant, QModelIndex + from PyQt5.QtWidgets import ( QApplication, QDialog, QVBoxLayout, QTableView, QWidget) except ImportError: - from PySide.QtCore import QAbstractTableModel, Qt, QModelIndex - from PySide.QtGui import ( - QApplication, QDialog, QVBoxLayout, QTableView, QWidget) - QVariant = lambda value=None: value + try: + from PyQt4.QtCore import QAbstractTableModel, Qt, QVariant, QModelIndex + from PyQt4.QtGui import ( + QApplication, QDialog, QVBoxLayout, QTableView, QWidget) + except ImportError: + from PySide.QtCore import QAbstractTableModel, Qt, QModelIndex + from PySide.QtGui import ( + QApplication, QDialog, QVBoxLayout, QTableView, QWidget) + QVariant = lambda value=None: value from pandas import DataFrame, Index @@ -119,7 +124,7 @@ def __init__(self, parent=None): df = testDf() # make up some data widget = DataFrameWidget(df) - widget.resizeColumnsToContents() + widget.dataTable.resizeColumnsToContents() layout = QVBoxLayout() layout.addWidget(widget)