Skip to content

Commit bfac825

Browse files
authored
Fix return type of QTableWidget.cellWidget (#198)
`cellWidget` returns a `QWidget` if it exists, or `None` if it doesn't exist. Confirmed by this short script: ```python from PyQt5 import QtCore, QtWidgets print(f'Qt {QtCore.QT_VERSION_STR}') print(f'PyQt {QtCore.PYQT_VERSION_STR}') app = QtWidgets.QApplication(['foo']) table = QtWidgets.QTableWidget(1, 1) # empty cell inside table print(table.cellWidget(0, 0)) # filled cell inside table table.setCellWidget(0, 0, QtWidgets.QWidget()) print(table.cellWidget(0, 0)) # cell outside table print(table.cellWidget(99, 99)) ``` Output: ``` Qt 5.15.2 PyQt 5.15.6 None <PyQt5.QtWidgets.QWidget object at 0x7fa13208bca0> None ```
2 parents 4634aba + 34b587a commit bfac825

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77
## To be released
8+
9+
### Added
810
* [#192](https://github.com/python-qt-tools/PyQt5-stubs/pull/192) Add missing platform specific stubs:
911
* Windows specific: QAxContainer.pyi QtWinExtras.pyi QtCore.QWinEventNotifier
1012
* MacOs X specific: QtMacExtras.pyi QtWidgets.QMacCocoaViewContainer
1113

14+
### Changed
15+
* [#198](https://github.com/python-qt-tools/PyQt5-stubs/pull/198) Corrected `QTableWidget.cellWidget()` to return an an optional `QWidget` instead of a list of `QWidgets`.
1216

13-
### Added
1417
## 5.15.6.0
1518

1619
### Added

PyQt5-stubs/QtWidgets.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -10637,7 +10637,7 @@ class QTableWidget(QTableView):
1063710637
def setRangeSelected(self, range: QTableWidgetSelectionRange, select: bool) -> None: ...
1063810638
def removeCellWidget(self, arow: int, acolumn: int) -> None: ...
1063910639
def setCellWidget(self, row: int, column: int, widget: QWidget) -> None: ...
10640-
def cellWidget(self, row: int, column: int) -> typing.List[QWidget]: ...
10640+
def cellWidget(self, row: int, column: int) -> typing.Optional[QWidget]: ...
1064110641
def closePersistentEditor(self, item: typing.Optional[QTableWidgetItem]) -> None: ... # type: ignore[override]
1064210642
def openPersistentEditor(self, item: typing.Optional[QTableWidgetItem]) -> None: ... # type: ignore[override]
1064310643
def editItem(self, item: typing.Optional[QTableWidgetItem]) -> None: ...

0 commit comments

Comments
 (0)