Move module __getattr__ to top for better visibility and remove underscore from _getattr_missing_optional_dep

Co-authored-by: Carlos Cordoba <[email protected]>

Author: DaelonSuzuka

qtpy/QtGui.py

@@ -9,7 +9,7 @@
 """Provides QtGui classes and functions."""
 
 from . import PYQT6, PYQT5, PYSIDE2, PYSIDE6, QtModuleNotInstalledError
-from .utils import _getattr_missing_optional_dep
+from .utils import getattr_missing_optional_dep
 
 
 _missing_optional_names = {}
@@ -32,6 +32,11 @@
     'QOpenGLWindow',
 }
 
+def __getattr__(name):
+    """Custom getattr to chain and wrap errors due to missing optional deps."""
+    raise getattr_missing_optional_dep(
+        name, module_name=__name__, optional_names=_missing_optional_names)
+
 
 if PYQT5:
     from PyQt5.QtGui import *
@@ -170,7 +175,3 @@ def movePositionPatched(
     QSinglePointEvent.globalX = lambda self: self.globalPosition().toPoint().x()
     QSinglePointEvent.globalY = lambda self: self.globalPosition().toPoint().y()
 
-def __getattr__(name):
-    """Custom getattr to chain and wrap errors due to missing optional deps."""
-    raise _getattr_missing_optional_dep(
-        name, module_name=__name__, optional_names=_missing_optional_names)

qtpy/QtWidgets.py

@@ -9,11 +9,16 @@
 """Provides widget classes and functions."""
 
 from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, QtModuleNotInstalledError
-from .utils import _getattr_missing_optional_dep
+from .utils import getattr_missing_optional_dep
 
 
 _missing_optional_names = {}
 
+def __getattr__(name):
+    """Custom getattr to chain and wrap errors due to missing optional deps."""
+    raise getattr_missing_optional_dep(
+        name, module_name=__name__, optional_names=_missing_optional_names)
+
 
 if PYQT5:
     from PyQt5.QtWidgets import *
@@ -80,8 +85,3 @@
     QDialog.exec_ = lambda self, *args, **kwargs: self.exec(*args, **kwargs)
     QMenu.exec_ = lambda self, *args, **kwargs: self.exec(*args, **kwargs)
 
-
-def __getattr__(name):
-    """Custom getattr to chain and wrap errors due to missing optional deps."""
-    raise _getattr_missing_optional_dep(
-        name, module_name=__name__, optional_names=_missing_optional_names)

qtpy/tests/optional_deps/__init__.py

@@ -4,7 +4,7 @@
 # See https://github.com/spyder-ide/qtpy/pull/387/
 
 
-from qtpy.utils import _getattr_missing_optional_dep
+from qtpy.utils import getattr_missing_optional_dep
 from .optional_dep import ExampleClass
 
 
@@ -23,5 +23,5 @@
 
 def __getattr__(name):
     """Custom getattr to chain and wrap errors due to missing optional deps."""
-    raise _getattr_missing_optional_dep(
+    raise getattr_missing_optional_dep(
         name, module_name=__name__, optional_names=_missing_optional_names)

qtpy/utils.py

@@ -24,7 +24,7 @@ def _wrap_missing_optional_dep_error(
     return qtpy_error
 
 
-def _getattr_missing_optional_dep(name, module_name, optional_names):
+def getattr_missing_optional_dep(name, module_name, optional_names):
     """Wrap AttributeError in a special error if it matches."""
     attr_error = AttributeError(f'module {module_name!r} has no attribute {name!r}')
     if name in optional_names: