QtDataVisualization: Fix importing with alias when the module doesn't…

… exists
dalthviz · Sep 21, 2021 · 35007f3 · 35007f3
1 parent 704826d
commit 35007f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/qtpy/__init__.py b/qtpy/__init__.py
@@ -231,7 +231,9 @@ class PythonQtWarning(Warning):
     except AttributeError:
         pass
 
-if (PYQT5 or PYSIDE2) and PY2 and sys.platform == "win32":
-    # QtDataVisualization backward compatibility (valid also on Windows)
-    # Only available for Python 2 on Windows and Qt5 bindings
+try:
+    # QtDataVisualization backward compatibility (QtDataVisualization vs. QtDatavisualization)
+    # Only available for Qt5 bindings > 5.9 on Windows
     from . import QtDataVisualization as QtDatavisualization
+except ImportError:
+    pass
diff --git a/qtpy/tests/test_qtwinextras.py b/qtpy/tests/test_qtwinextras.py
@@ -4,13 +4,11 @@
 import sys
 
 import pytest
-from qtpy import PYQT5, PYSIDE2
-from qtpy.py3compat import PY3
+from qtpy import PYSIDE2
 
 @pytest.mark.skipif(
-    sys.platform != "win32" or not (PYQT5 or PYSIDE2) or
-    os.environ['USE_CONDA'] == 'Yes' and PY3 and PYQT5,
-    reason="Only available in Qt5 bindings and Windows platform")
+    sys.platform != "win32" or os.environ['USE_CONDA'] == 'Yes',
+    reason="Only available in Qt5 bindings > 5.9 (only available with pip in the current CI setup) and Windows platform")
 def test_qtwinextras():
     """Test the qtpy.QtWinExtras namespace"""
     from qtpy import QtWinExtras