Merge branch 'master' into v4.1.x

davidhozic · Oct 1, 2024 · ee9728d · ee9728d
2 parents 8232306 + e1b7c6f
commit ee9728d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 30 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -37,6 +37,11 @@ Glossary
 Releases
 ---------------------
 
+v4.1.1
+=====================
+- Fixed segmentation-fault crash when using Python 3.12+.
+
+
 v4.1.0
 =====================
 - New message period types:

diff --git a/src/daf/__init__.py b/src/daf/__init__.py
@@ -18,16 +18,5 @@
 from .responder import *
 from .messagedata import *
 
-import sys
-import warnings
 
-
-VERSION = "4.1.0"
-
-
-if sys.version_info.minor == 12 and sys.version_info.major == 3:
-    warnings.warn(
-        "DAF's support on Python 3.12 is limited. Web browser features and"
-        " SQL logging are not supported in Python 3.12. Please install Python 3.11 instead."
-        " Additional GUI may be unstable on Python 3.12"
-    )
+VERSION = "4.1.1"
diff --git a/src/daf_gui/main.py b/src/daf_gui/main.py
@@ -1,13 +1,7 @@
 """
 Main file of the DAF GUI.
 """
-from importlib.util import find_spec
-from pathlib import Path
-
 import tk_async_execute as tae
-import subprocess
-import json
-
 import ttkbootstrap as ttk
 
 from ttkbootstrap.toast import ToastNotification
@@ -21,11 +15,10 @@
 from .connector import *
 from .tabs import *
 
-import tkinter as tk
 import ttkbootstrap.dialogs.dialogs as tkdiag
 import ttkbootstrap.style as tkstyle
+import tkinter as tk
 
-import sys
 import os
 import daf
 
@@ -115,14 +108,6 @@ def __init__(self) -> None:
         self.win_main.protocol("WM_DELETE_WINDOW", self.close_window)
         self.tabman_mf.select(1)
 
-        if sys.version_info.minor == 12 and sys.version_info.major == 3:
-            tkdiag.Messagebox.show_warning(
-                "DAF's support on Python 3.12 is limited. Web browser features and"
-                " SQL logging are not supported in Python 3.12. Please install Python 3.11 instead.\n"
-                "Additional GUI can be unstable on Python 3.12",
-                "Compatibility warning!"
-            )
-
     def init_menu(self):
         "Initializes GUI toolbar menu"
         menu = ttk.Menu(self.win_main)

diff --git a/src/daf_gui/tabs/analytics.py b/src/daf_gui/tabs/analytics.py
@@ -92,8 +92,8 @@ async def analytics_load_history():
                 it.ObjectReference.from_object(logger), getter_history, **param_object_params
             )
             items = convert_to_object_info(items)
-            lst_history.clear()
-            lst_history.insert(tk.END, *items)
+            tae.tk_execute(lst_history.clear)
+            tae.tk_execute(lst_history.insert, tk.END, *items)
 
         def show_log(listbox: ListBoxScrolled):
             selection = listbox.curselection()