eric6.py: added support for the new exit scheme as of PyQt 5.13.1 in order to test it. That will become the default scheme with PyQt 5.14.

Sat, 14 Sep 2019 11:32:35 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 14 Sep 2019 11:32:35 +0200
changeset 7234
b20fb38a6bfc
parent 7233
9cb57c5ee27d
child 7235
4f23ea4af43c

eric6.py: added support for the new exit scheme as of PyQt 5.13.1 in order to test it. That will become the default scheme with PyQt 5.14.

eric6/eric6.py file | annotate | diff | comparison | revisions
--- a/eric6/eric6.py	Fri Sep 13 18:55:20 2019 +0200
+++ b/eric6/eric6.py	Sat Sep 14 11:32:35 2019 +0200
@@ -26,13 +26,17 @@
 sys.path.insert(1, os.path.dirname(__file__))
 
 try:
+    from PyQt5.QtCore import pyqt5_enable_new_onexit_scheme
+    # __IGNORE_WARNING__ __IGNORE_EXCEPTION__
+except ImportError:
     try:
-        from PyQt5 import sip       # __IGNORE_EXCEPTION__
-    except ImportError:
-        import sip
-    sip.setdestroyonexit(False)
-except AttributeError:
-    pass
+        try:
+            from PyQt5 import sip       # __IGNORE_EXCEPTION__
+        except ImportError:
+            import sip
+        sip.setdestroyonexit(False)
+    except AttributeError:
+        pass
 
 import traceback
 import time

eric ide

mercurial