Merge pull request #131 from LedgerHQ/fix

[fix] Manage 'Qt*' import error instead of 'QtCore' only
LedgerHQ · May 31, 2023 · 0aa955a · 0aa955a
2 parents 758b495 + e199dfa
commit 0aa955a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [1.8.1] - 2023-05-30
+## [1.8.2] - 2023-05-31
 
-### Fix
+### Fixed
+- import: Fix from 1.8.1 was not wide enough. Exception was filtered on 'QtCore', but they could
+          also throw as 'QtWidgets'.
+
+## [1.8.1] - 2023-05-31
+
+### Fixed
 - import: Feature developed in [this branch](/~https://github.com/LedgerHQ/ragger/pull/76) forced all
           Ragger installation to have PyQt5 and its dependencies installed. This is no longer the
           case.

diff --git a/src/ragger/gui/__init__.py b/src/ragger/gui/__init__.py
@@ -16,7 +16,8 @@
 try:
     from .process import RaggerGUI
 except ImportError as e:
-    if e.name != "QtCore":
+    # Can be 'QtCore' or 'QtWidgets'
+    if e.name is None or not e.name.startswith("Qt"):
         raise e
 
     def RaggerGUI(*args, **kwatgs):  # type: ignore