Skip to content

Commit

Permalink
use py3 super calls
Browse files Browse the repository at this point in the history
  • Loading branch information
iLLiCiTiT committed Jun 24, 2024
1 parent 04e257a commit 05f2328
Show file tree
Hide file tree
Showing 17 changed files with 125 additions and 125 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

class InstancesModel(QtGui.QStandardItemModel):
def __init__(self, *args, **kwargs):
super(InstancesModel, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self._items_by_id = {}
self._plugin_items_by_id = {}
Expand Down Expand Up @@ -83,7 +83,7 @@ def set_report(self, report_item):

class InstanceProxyModel(QtCore.QSortFilterProxyModel):
def __init__(self, *args, **kwargs):
super(InstanceProxyModel, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self._ignore_removed = True

Expand Down Expand Up @@ -116,7 +116,7 @@ class PluginsModel(QtGui.QStandardItemModel):
)

def __init__(self, *args, **kwargs):
super(PluginsModel, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self._items_by_id = {}
self._plugin_items_by_id = {}
Expand Down Expand Up @@ -185,7 +185,7 @@ def set_report(self, report_item):

class PluginProxyModel(QtCore.QSortFilterProxyModel):
def __init__(self, *args, **kwargs):
super(PluginProxyModel, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self._ignore_skipped = True

Expand Down
22 changes: 11 additions & 11 deletions client/ayon_core/tools/publisher/publish_report_viewer/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def set_report(self, report):

class DetailWidget(QtWidgets.QTextEdit):
def __init__(self, text, *args, **kwargs):
super(DetailWidget, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self.setReadOnly(True)
self.setHtml(text)
Expand All @@ -73,7 +73,7 @@ def sizeHint(self):

class PluginLoadReportWidget(QtWidgets.QWidget):
def __init__(self, parent):
super(PluginLoadReportWidget, self).__init__(parent)
super().__init__(parent)

view = QtWidgets.QTreeView(self)
view.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
Expand Down Expand Up @@ -101,11 +101,11 @@ def _on_expand(self, index):
self._create_widget(child_index)

def showEvent(self, event):
super(PluginLoadReportWidget, self).showEvent(event)
super().showEvent(event)
self._update_widgets_size_hints()

def resizeEvent(self, event):
super(PluginLoadReportWidget, self).resizeEvent(event)
super().resizeEvent(event)
self._update_widgets_size_hints()

def _update_widgets_size_hints(self):
Expand Down Expand Up @@ -146,7 +146,7 @@ class ZoomPlainText(QtWidgets.QPlainTextEdit):
max_point_size = 200.0

def __init__(self, *args, **kwargs):
super(ZoomPlainText, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

anim_timer = QtCore.QTimer()
anim_timer.setInterval(20)
Expand All @@ -160,7 +160,7 @@ def __init__(self, *args, **kwargs):
def wheelEvent(self, event):
modifiers = QtWidgets.QApplication.keyboardModifiers()
if modifiers != QtCore.Qt.ControlModifier:
super(ZoomPlainText, self).wheelEvent(event)
super().wheelEvent(event)
return

if hasattr(event, "angleDelta"):
Expand Down Expand Up @@ -219,7 +219,7 @@ def _scaling_callback(self):

class DetailsWidget(QtWidgets.QWidget):
def __init__(self, parent):
super(DetailsWidget, self).__init__(parent)
super().__init__(parent)

output_widget = ZoomPlainText(self)
output_widget.setObjectName("PublishLogConsole")
Expand Down Expand Up @@ -327,7 +327,7 @@ class DetailsPopup(QtWidgets.QDialog):
closed = QtCore.Signal()

def __init__(self, parent, center_widget):
super(DetailsPopup, self).__init__(parent)
super().__init__(parent)
self.setWindowTitle("Report Details")
layout = QtWidgets.QHBoxLayout(self)

Expand All @@ -338,19 +338,19 @@ def __init__(self, parent, center_widget):
def showEvent(self, event):
layout = self.layout()
layout.insertWidget(0, self._center_widget)
super(DetailsPopup, self).showEvent(event)
super().showEvent(event)
if self._first_show:
self._first_show = False
self.resize(700, 400)

def closeEvent(self, event):
super(DetailsPopup, self).closeEvent(event)
super().closeEvent(event)
self.closed.emit()


class PublishReportViewerWidget(QtWidgets.QFrame):
def __init__(self, parent=None):
super(PublishReportViewerWidget, self).__init__(parent)
super().__init__(parent)

instances_model = InstancesModel()
instances_proxy = InstanceProxyModel()
Expand Down
18 changes: 9 additions & 9 deletions client/ayon_core/tools/publisher/publish_report_viewer/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class LoadedFilesModel(QtGui.QStandardItemModel):
header_labels = ("Reports", "Created")

def __init__(self, *args, **kwargs):
super(LoadedFilesModel, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

# Column count must be set before setting header data
self.setColumnCount(len(self.header_labels))
Expand Down Expand Up @@ -350,7 +350,7 @@ def data(self, index, role=None):
if col != 0:
index = self.index(index.row(), 0, index.parent())

return super(LoadedFilesModel, self).data(index, role)
return super().data(index, role)

def setData(self, index, value, role=None):
if role is None:
Expand All @@ -364,13 +364,13 @@ def setData(self, index, value, role=None):
report_item.save()
value = report_item.label

return super(LoadedFilesModel, self).setData(index, value, role)
return super().setData(index, value, role)

def flags(self, index):
# Allow editable flag only for first column
if index.column() > 0:
return QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled
return super(LoadedFilesModel, self).flags(index)
return super().flags(index)

def _create_item(self, report_item):
if report_item.id in self._items_by_id:
Expand Down Expand Up @@ -451,7 +451,7 @@ class LoadedFilesView(QtWidgets.QTreeView):
selection_changed = QtCore.Signal()

def __init__(self, *args, **kwargs):
super(LoadedFilesView, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.setEditTriggers(
QtWidgets.QAbstractItemView.EditKeyPressed
| QtWidgets.QAbstractItemView.SelectedClicked
Expand Down Expand Up @@ -502,11 +502,11 @@ def _on_rows_inserted(self):
self._update_remove_btn()

def resizeEvent(self, event):
super(LoadedFilesView, self).resizeEvent(event)
super().resizeEvent(event)
self._update_remove_btn()

def showEvent(self, event):
super(LoadedFilesView, self).showEvent(event)
super().showEvent(event)
self._model.refresh()
header = self.header()
header.resizeSections(QtWidgets.QHeaderView.ResizeToContents)
Expand Down Expand Up @@ -548,7 +548,7 @@ class LoadedFilesWidget(QtWidgets.QWidget):
report_changed = QtCore.Signal()

def __init__(self, parent):
super(LoadedFilesWidget, self).__init__(parent)
super().__init__(parent)

self.setAcceptDrops(True)

Expand Down Expand Up @@ -598,7 +598,7 @@ class PublishReportViewerWindow(QtWidgets.QWidget):
default_height = 600

def __init__(self, parent=None):
super(PublishReportViewerWindow, self).__init__(parent)
super().__init__(parent)
self.setWindowTitle("Publish report viewer")
icon = QtGui.QIcon(get_ayon_icon_filepath())
self.setWindowIcon(icon)
Expand Down
10 changes: 5 additions & 5 deletions client/ayon_core/tools/publisher/widgets/border_label_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class _VLineWidget(QtWidgets.QWidget):
It is expected that parent widget will set width.
"""
def __init__(self, color, line_size, left, parent):
super(_VLineWidget, self).__init__(parent)
super().__init__(parent)
self._color = color
self._left = left
self._line_size = line_size
Expand Down Expand Up @@ -69,7 +69,7 @@ class _HBottomLineWidget(QtWidgets.QWidget):
It is expected that parent widget will set height and radius.
"""
def __init__(self, color, line_size, parent):
super(_HBottomLineWidget, self).__init__(parent)
super().__init__(parent)
self._color = color
self._radius = 0
self._line_size = line_size
Expand Down Expand Up @@ -128,7 +128,7 @@ class _HTopCornerLineWidget(QtWidgets.QWidget):
"""

def __init__(self, color, line_size, left_side, parent):
super(_HTopCornerLineWidget, self).__init__(parent)
super().__init__(parent)
self._left_side = left_side
self._line_size = line_size
self._color = color
Expand Down Expand Up @@ -192,7 +192,7 @@ class BorderedLabelWidget(QtWidgets.QFrame):
└──────────────────────┘
"""
def __init__(self, label, parent):
super(BorderedLabelWidget, self).__init__(parent)
super().__init__(parent)
color_value = get_objected_colors("border")
color = None
if color_value:
Expand Down Expand Up @@ -269,7 +269,7 @@ def set_line_size(self, line_size):
self._recalculate_sizes()

def showEvent(self, event):
super(BorderedLabelWidget, self).showEvent(event)
super().showEvent(event)
self._recalculate_sizes()

def _recalculate_sizes(self):
Expand Down
20 changes: 10 additions & 10 deletions client/ayon_core/tools/publisher/widgets/card_view_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class BaseGroupWidget(QtWidgets.QWidget):
double_clicked = QtCore.Signal()

def __init__(self, group_name, parent):
super(BaseGroupWidget, self).__init__(parent)
super().__init__(parent)

label_widget = QtWidgets.QLabel(group_name, self)

Expand Down Expand Up @@ -210,7 +210,7 @@ class InstanceGroupWidget(BaseGroupWidget):
active_changed = QtCore.Signal(str, str, bool)

def __init__(self, group_icons, *args, **kwargs):
super(InstanceGroupWidget, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self._group_icons = group_icons

Expand Down Expand Up @@ -280,14 +280,14 @@ class CardWidget(BaseClickableFrame):
double_clicked = QtCore.Signal()

def __init__(self, parent):
super(CardWidget, self).__init__(parent)
super().__init__(parent)
self.setObjectName("CardViewWidget")

self._selected = False
self._id = None

def mouseDoubleClickEvent(self, event):
super(CardWidget, self).mouseDoubleClickEvent(event)
super().mouseDoubleClickEvent(event)
if self._is_valid_double_click(event):
self.double_clicked.emit()

Expand Down Expand Up @@ -335,7 +335,7 @@ class ContextCardWidget(CardWidget):
"""

def __init__(self, parent):
super(ContextCardWidget, self).__init__(parent)
super().__init__(parent)

self._id = CONTEXT_ID
self._group_identifier = CONTEXT_GROUP
Expand Down Expand Up @@ -365,7 +365,7 @@ class ConvertorItemCardWidget(CardWidget):
"""

def __init__(self, item, parent):
super(ConvertorItemCardWidget, self).__init__(parent)
super().__init__(parent)

self._id = item.id
self.identifier = item.identifier
Expand Down Expand Up @@ -398,7 +398,7 @@ class InstanceCardWidget(CardWidget):
active_changed = QtCore.Signal(str, bool)

def __init__(self, instance, group_icon, parent):
super(InstanceCardWidget, self).__init__(parent)
super().__init__(parent)

self._id = instance.id
self._group_identifier = instance.group_label
Expand Down Expand Up @@ -561,7 +561,7 @@ class InstanceCardView(AbstractInstanceView):
double_clicked = QtCore.Signal()

def __init__(self, controller, parent):
super(InstanceCardView, self).__init__(parent)
super().__init__(parent)

self._controller: AbstractPublisherFrontend = controller

Expand Down Expand Up @@ -613,7 +613,7 @@ def sizeHint(self):
+ scroll_bar.sizeHint().width()
)

result = super(InstanceCardView, self).sizeHint()
result = super().sizeHint()
result.setWidth(width)
return result

Expand Down Expand Up @@ -654,7 +654,7 @@ def keyPressEvent(self, event):
self._toggle_instances(1)
return True

return super(InstanceCardView, self).keyPressEvent(event)
return super().keyPressEvent(event)

def _get_selected_widgets(self):
output = []
Expand Down
10 changes: 5 additions & 5 deletions client/ayon_core/tools/publisher/widgets/create_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ class ResizeControlWidget(QtWidgets.QWidget):
resized = QtCore.Signal()

def resizeEvent(self, event):
super(ResizeControlWidget, self).resizeEvent(event)
super().resizeEvent(event)
self.resized.emit()


# TODO add creator identifier/label to details
class CreatorShortDescWidget(QtWidgets.QWidget):
def __init__(self, parent=None):
super(CreatorShortDescWidget, self).__init__(parent=parent)
super().__init__(parent=parent)

# --- Short description widget ---
icon_widget = IconValuePixmapLabel(None, self)
Expand Down Expand Up @@ -100,13 +100,13 @@ def lessThan(self, left, right):
l_show_order = left.data(CREATOR_SORT_ROLE)
r_show_order = right.data(CREATOR_SORT_ROLE)
if l_show_order == r_show_order:
return super(CreatorsProxyModel, self).lessThan(left, right)
return super().lessThan(left, right)
return l_show_order < r_show_order


class CreateWidget(QtWidgets.QWidget):
def __init__(self, controller, parent=None):
super(CreateWidget, self).__init__(parent)
super().__init__(parent)

self._controller: AbstractPublisherFrontend = controller

Expand Down Expand Up @@ -755,7 +755,7 @@ def _on_first_show(self):
self._creators_splitter.setSizes([part, rem_width])

def showEvent(self, event):
super(CreateWidget, self).showEvent(event)
super().showEvent(event)
if self._first_show:
self._first_show = False
self._on_first_show()
Expand Down
4 changes: 2 additions & 2 deletions client/ayon_core/tools/publisher/widgets/folders_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class FoldersDialog(QtWidgets.QDialog):
"""Dialog to select folder for a context of instance."""

def __init__(self, controller, parent):
super(FoldersDialog, self).__init__(parent)
super().__init__(parent)
self.setWindowTitle("Select folder")

filter_input = PlaceholderLineEdit(self)
Expand Down Expand Up @@ -105,7 +105,7 @@ def _on_controller_reset(self):

def showEvent(self, event):
"""Refresh folders widget on show."""
super(FoldersDialog, self).showEvent(event)
super().showEvent(event)
if self._first_show:
self._first_show = False
self._on_first_show()
Expand Down
Loading

0 comments on commit 05f2328

Please sign in to comment.