Merge pull request #497 from nucleic/qevent

qt: use QEvent.Type to coerce new regsitered event type with all bind…

enaml/qt/compat.py

@@ -16,11 +16,3 @@ def global_pos_from_event(event):
 else:
     def global_pos_from_event(event):
         return event.globalPos()
-
-
-if QT_API in PYQT6_API:
-    def coerce_to_qevent_type(event_value):
-        return event_value
-else:
-    def coerce_to_qevent_type(event_value):
-        return QEvent.Type(event_value)

enaml/qt/docking/event_types.py

@@ -5,44 +5,43 @@
 #
 # The full license is in the file LICENSE, distributed with this software.
 #------------------------------------------------------------------------------
-from enaml.qt.compat import coerce_to_qevent_type
 from enaml.qt.QtCore import QEvent
 
 
 #: An event type which indicates the contents of a dock area changed.
-DockAreaContentsChanged = coerce_to_qevent_type(QEvent.registerEventType())
+DockAreaContentsChanged = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was docked.
-DockItemDocked = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemDocked = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was undock.
-DockItemUndocked = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemUndocked = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was extended.
-DockItemExtended = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemExtended = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was retracted.
-DockItemRetracted = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemRetracted = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was shown.
-DockItemShown = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemShown = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was hidden.
-DockItemHidden = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemHidden = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates the dock item was closed.
-DockItemClosed = coerce_to_qevent_type(QEvent.registerEventType())
+DockItemClosed = QEvent.Type(QEvent.registerEventType())
 
 
 #: An event type which indicates a dock tab was selected.
-DockTabSelected = coerce_to_qevent_type(QEvent.registerEventType())
+DockTabSelected = QEvent.Type(QEvent.registerEventType())
 
 
 class QDockItemEvent(QEvent):
@@ -54,7 +53,7 @@ def __init__(self, type, name):
 
         Parameters
         ----------
-        type : coerce_to_qevent_type
+        type : QEvent.Type
             The event type for the event.
 
         name : unicode

enaml/qt/q_deferred_caller.py

@@ -5,7 +5,6 @@
 #
 # The full license is in the file LICENSE, distributed with this software.
 #------------------------------------------------------------------------------
-from .compat import coerce_to_qevent_type
 from .QtCore import QObject, QTimer, QEvent, QThread
 from .QtWidgets import QApplication
 
@@ -15,7 +14,7 @@ class DeferredCallEvent(QEvent):
 
     """
     # Explicitly coerce to QEvent.Type for PySide compatibility.
-    Type = coerce_to_qevent_type(QEvent.registerEventType())
+    Type = QEvent.Type(QEvent.registerEventType())
 
     def __init__(self, callback, args, kwargs):
         super(DeferredCallEvent, self).__init__(self.Type)

pyproject.toml

@@ -38,7 +38,7 @@ dynamic=["version"]
 [project.optional-dependencies]
 qt5-pyqt = ["qtpy", "PyQt5"]
 qt5-pyside = ["qtpy", "pyside2"]
-qt6-pyqt = ["qtpy>=2.1.0", "PyQt6>=6.2"]
+qt6-pyqt = ["qtpy>=2.1.0", "PyQt6>=6.3.1"]
 qt6-pyside = ["qtpy>=2.1.0", "pyside6>=6.2.3"]
 scintilla-qt5-pyqt = ["QScintilla"]
 scintilla-qt6-pyqt = ["PyQt6-QScintilla"]