Merge pull request #345 from ales-erjavec/utils-import-min

[ENH] utils: Minimize imports for utils

Author: janezd

i18n/si/msgs.jaml

@@ -3495,9 +3495,6 @@ utils/__init__.py:
     findf: false
     set_flag: false
     is_flag_set: false
-    qsizepolicy_is_expanding: false
-    qsizepolicy_is_shrinking: false
-    is_event_source_mouse: false
     UNUSED: false
     H: false
     A: false
@@ -3529,6 +3526,14 @@ utils/__init__.py:
         Callable[[A], H]: false
     def `findf`:
         Union[A, B]: false
+    qsizepolicy_is_expanding: false
+    orangecanvas.gui.utils.qsizepolicy_is_expanding: false
+    qsizepolicy_is_shrinking: false
+    orangecanvas.gui.utils.qsizepolicy_is_shrinking: false
+    is_event_source_mouse: false
+    orangecanvas.gui.utils.is_event_source_mouse: false
+    def `__getattr__`:
+        "'{__name__}.{name}' is deprecated, use '{_LAZY_DEPRECATED[name]}'": false
 utils/after_exit.py:
     def `run_after_exit`:
         --arg=: false

orangecanvas/canvas/view.py

@@ -12,7 +12,7 @@
 )
 from AnyQt.QtCore import Property, pyqtSignal as Signal
 
-from orangecanvas.utils import is_event_source_mouse
+from orangecanvas.gui.utils import is_event_source_mouse
 
 log = logging.getLogger(__name__)
 

orangecanvas/gui/utils.py

@@ -5,8 +5,6 @@
 import os
 import sys
 import traceback
-from typing import List
-
 import ctypes
 import ctypes.util
 import platform
@@ -15,16 +13,19 @@
 from typing import Optional, Union
 
 from AnyQt.QtWidgets import (
-    QWidget, QMessageBox, QStyleOption, QStyle, QTextEdit, QScrollBar
+    QWidget, QMessageBox, QStyleOption, QStyle, QTextEdit, QScrollBar,
+    QSizePolicy
 )
 from AnyQt.QtGui import (
     QGradient, QLinearGradient, QRadialGradient, QBrush, QPainter,
     QPaintEvent, QColor, QPixmap, QPixmapCache, QTextOption, QGuiApplication,
-    QTextCharFormat, QFont
+    QTextCharFormat, QFont, QMouseEvent, QWheelEvent
 )
 from AnyQt.QtCore import Qt, QPointF, QPoint, QRect, QRectF, Signal, QEvent
 from AnyQt import sip
 
+from orangecanvas.utils import is_flag_set
+
 
 @contextmanager
 def updates_disabled(widget):
@@ -787,3 +788,23 @@ def available_screen_geometry(widget: QWidget, pos: Optional[QPoint] = None) ->
         if sibling is not None:
             screen = sibling
     return screen.availableGeometry()
+
+
+def qsizepolicy_is_expanding(policy: QSizePolicy.Policy) -> bool:
+    return is_flag_set(policy, QSizePolicy.ExpandFlag)
+
+
+def qsizepolicy_is_shrinking(policy: QSizePolicy.Policy) -> bool:
+    return is_flag_set(policy, QSizePolicy.ShrinkFlag)
+
+
+def is_event_source_mouse(event: Union[QWheelEvent, QMouseEvent]) -> bool:
+    """
+    Does thw event originate from a mouse type device or from another source
+    (touchpad/screen).
+    """
+    try:
+        return event.source() != Qt.MouseEventNotSynthesized
+    except AttributeError:  # PyQt6
+        from AnyQt.QtGui import QInputDevice
+        return event.device().type() == QInputDevice.DeviceType.Mouse

orangecanvas/utils/__init__.py

@@ -1,20 +1,15 @@
 import enum
 import operator
 import types
+import warnings
 from functools import reduce
 
 import typing
 from typing import (
     Iterable, Set, Any, Optional, Union, Tuple, Callable, Mapping, List, Dict,
-    SupportsInt, cast, overload
+    SupportsInt, cast, overload,
 )
 
-from AnyQt.QtCore import Qt
-from AnyQt.QtGui import QMouseEvent, QWheelEvent
-from AnyQt.QtWidgets import QSizePolicy
-
-from .qtcompat import toPyObject
-
 __all__ = [
     "dotted_getattr",
     "qualified_name",
@@ -33,9 +28,6 @@
     "findf",
     "set_flag",
     "is_flag_set",
-    "qsizepolicy_is_expanding",
-    "qsizepolicy_is_shrinking",
-    "is_event_source_mouse",
     "UNUSED",
 ]
 
@@ -324,26 +316,6 @@ def is_flag_set(flags, mask):
     return bool(flags_i & mask_i)
 
 
-def qsizepolicy_is_expanding(policy: QSizePolicy.Policy) -> bool:
-    return is_flag_set(policy, QSizePolicy.ExpandFlag)
-
-
-def qsizepolicy_is_shrinking(policy: QSizePolicy.Policy) -> bool:
-    return is_flag_set(policy, QSizePolicy.ShrinkFlag)
-
-
-def is_event_source_mouse(event: Union[QWheelEvent, QMouseEvent]) -> bool:
-    """
-    Does th event originate from a mouse type device or from another source
-    (touchpad/screen).
-    """
-    try:
-        return event.source() != Qt.MouseEventNotSynthesized
-    except AttributeError:  # PyQt6
-        from AnyQt.QtGui import QInputDevice
-        return event.device().type() == QInputDevice.DeviceType.Mouse
-
-
 def UNUSED(*_unused_args) -> None:
     """
     *Mark* the function arguments as unused for a code checker
@@ -354,3 +326,21 @@ def UNUSED(*_unused_args) -> None:
     ...     UNUSED(bar, baz)
     ...     return True
     """
+
+
+# These were moved to minimize imports.
+_LAZY_DEPRECATED= {
+    "qsizepolicy_is_expanding": "orangecanvas.gui.utils.qsizepolicy_is_expanding",
+    "qsizepolicy_is_shrinking": "orangecanvas.gui.utils.qsizepolicy_is_shrinking",
+    "is_event_source_mouse": "orangecanvas.gui.utils.is_event_source_mouse",
+}
+
+def __getattr__(name):
+    if name in _LAZY_DEPRECATED:
+        warnings.warn(
+            f"'{__name__}.{name}' is deprecated, use '{_LAZY_DEPRECATED[name]}'",
+            DeprecationWarning,
+            stacklevel=2
+        )
+        return name_lookup(_LAZY_DEPRECATED[name])
+    raise AttributeError(name)

orangecanvas/utils/overlay.py

@@ -11,7 +11,7 @@
     QVBoxLayout, QLabel, QSizePolicy, QStyleOption, QFocusFrame, QStylePainter, QStyleOptionButton
 
 from orangecanvas.gui.stackedwidget import StackLayout
-from orangecanvas.utils import qsizepolicy_is_expanding
+from orangecanvas.gui.utils import qsizepolicy_is_expanding
 
 log = logging.getLogger(__name__)