tksheet 7.4.20__py3-none-any.whl → 7.4.21__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.4.20"
+__version__ = "7.4.21"
 
 from .colors import (
     color_map,

tksheet/functions.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import csv
 import io
-import pickle
 import re
 import tkinter as tk
 from bisect import bisect_left
@@ -17,7 +16,6 @@ from .constants import align_value_error, symbols_set
 from .formatters import to_bool
 from .other_classes import DotDict, EventDataDict, Highlight, Loc, Span
 
-unpickle_obj = pickle.loads
 lines_re = re.compile(r"[^\n]+")
 ORD_A = ord("A")
 

tksheet/main_table.py

@@ -73,7 +73,6 @@ from .functions import (
     len_to_idx,
     mod_event_val,
     mod_span,
-    mod_span_widget,
     move_elements_by_mapping_gen,
     move_fast,
     new_tk_event,
@@ -83,7 +82,6 @@ from .functions import (
     span_idxs_post_move,
     stored_event_dict,
     try_binding,
-    unpickle_obj,
     wrap_text,
 )
 from .other_classes import (
@@ -1528,7 +1526,7 @@ class MainTable(tk.Canvas):
                 "displayed": {} if disp_new_idxs is None else disp_new_idxs,
             }
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
 
         if move_widths and disp_new_idxs:
             self.set_col_positions(
@@ -1787,7 +1785,7 @@ class MainTable(tk.Canvas):
                 "displayed": {} if disp_new_idxs is None else disp_new_idxs,
             }
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
 
         if move_data:
             maxidx = len_to_idx(totalrows)
@@ -2081,9 +2079,7 @@ class MainTable(tk.Canvas):
         if "tagged_columns" in modification["options"]:
             self.tagged_columns = modification["options"]["tagged_columns"]
         if modification["named_spans"]:
-            self.named_spans = {
-                k: mod_span_widget(unpickle_obj(v), self.PAR) for k, v in modification["named_spans"].items()
-            }
+            self.named_spans = modification["named_spans"]
         if modification["sheet_state"]:
             self.RI.tree_open_ids = modification["sheet_state"]["tree_open_ids"]
             self.row_positions = modification["sheet_state"]["row_positions"]
@@ -5467,7 +5463,7 @@ class MainTable(tk.Canvas):
         if not event_data:
             event_data = self.new_event_dict("delete_columns", state=True)
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
         for i, datacn in enumerate(cols):
             for rn in range(len(self.data)):
                 if datacn not in event_data["deleted"]["columns"]:
@@ -5557,7 +5553,7 @@ class MainTable(tk.Canvas):
         if not event_data:
             event_data = self.new_event_dict("delete_rows", state=True)
         event_data["options"] = self.copy_options()
-        event_data["named_spans"] = {k: span.pickle_self() for k, span in self.named_spans.items()}
+        event_data["named_spans"] = {k: span.copy_self() for k, span in self.named_spans.items()}
 
         for i, datarn in enumerate(rows):
             event_data["deleted"]["rows"][datarn] = self.data.pop(datarn - i)

tksheet/other_classes.py

@@ -1,14 +1,11 @@
 from __future__ import annotations
 
-import pickle
+import copy
 import tkinter as tk
 from collections import namedtuple
 from collections.abc import Callable, Hashable, Iterator
-from functools import partial
 from typing import Any, Literal
 
-pickle_obj = partial(pickle.dumps, protocol=pickle.HIGHEST_PROTOCOL)
-
 FontTuple = namedtuple("FontTuple", "family size style")
 Box_nt = namedtuple(
     "Box_nt",
@@ -423,12 +420,45 @@ class Span(dict):
         cols = self.columns
         return Box_nt(rows.from_, cols.from_, rows.upto_, cols.upto_)
 
-    def pickle_self(self) -> bytes:
-        x = self["widget"]
-        self["widget"] = None
-        p = pickle_obj(self)
-        self["widget"] = x
-        return p
+    def copy_self(self) -> "Span":
+        # Create a new Span instance
+        span = Span()
+
+        # Iterate over all dictionary items to capture all attributes
+        for key, value in self.items():
+            if key == "widget":
+                # Tkinter widget: retain reference (do not copy)
+                span[key] = value
+            elif key == "kwargs":
+                # Handle kwargs, which may contain functions or lambdas
+                span[key] = {}
+                for k, v in value.items():
+                    if callable(v):
+                        # Functions/lambdas: shallow copy (immutable, but check for safety)
+                        span[key][k] = v
+                    else:
+                        try:
+                            # Deep copy non-callable items in kwargs
+                            span[key][k] = copy.deepcopy(v)
+                        except (TypeError, AttributeError):
+                            # Handle non-copyable objects (e.g., complex closures or objects)
+                            span[key][k] = v  # Fallback to shallow copy
+            elif key == "convert" and callable(value):
+                # Convert is a callable: shallow copy (immutable)
+                span[key] = value
+            else:
+                # Deep copy other values to handle nested objects like DotDict
+                try:
+                    span[key] = copy.deepcopy(value)
+                except (TypeError, AttributeError):
+                    # Fallback for non-copyable objects
+                    span[key] = value  # Shallow copy as fallback
+
+        # Ensure widget is set if not already present (edge case)
+        if "widget" not in span and hasattr(self, "widget"):
+            span["widget"] = self["widget"]
+
+        return span
 
     __setattr__ = __setitem__
     __getattr__ = __getitem__

tksheet/top_left_rectangle.py

@@ -4,6 +4,7 @@ import tkinter as tk
 from typing import Any
 
 from .constants import rc_binding
+from .functions import try_binding
 
 
 class TopLeftRectangle(tk.Canvas):
@@ -198,10 +199,8 @@ class TopLeftRectangle(tk.Canvas):
         )
         self.coords(self.select_all_box, 0, 0, w - 5, h - 5)
 
-    def mouse_motion(self, event: Any = None) -> None:
-        self.MT.reset_mouse_motion_creations()
-        if self.extra_motion_func is not None:
-            self.extra_motion_func(event)
+    def mouse_motion(self, event: Any) -> None:
+        try_binding(self.extra_motion_func, event)
 
     def b1_press(self, event: Any = None) -> None:
         self.focus_set()

{tksheet-7.4.20.dist-info → tksheet-7.4.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tksheet
-Version: 7.4.20
+Version: 7.4.21
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

{tksheet-7.4.20.dist-info → tksheet-7.4.21.dist-info}/RECORD

@@ -1,12 +1,12 @@
-tksheet/__init__.py,sha256=PpkbN7xCe4kL9f_ReQmjZFSjqrJtjldKtRMpIJXWnZM,2327
+tksheet/__init__.py,sha256=qibxlAtUNwyDztrSuu3utGUQAfNrmJHEMEydswd4YAw,2327
 tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
 tksheet/column_headers.py,sha256=cP0RImb-EgHdVLSfNmU42k5GwCol7akKgMH6xq1sZfY,103339
 tksheet/constants.py,sha256=aiDvUSaPtl_TSNtRRJ_p87c9iTBz9ksMd5IsSXzz4Hk,13316
 tksheet/find_window.py,sha256=w6S0FZFLRNHiM57Oq97avALT_PctIBPegSxnkNUwkwk,19982
 tksheet/formatters.py,sha256=DGcRiMsDJnySNpQcjfiX84oJ7TmOSMdU6u9injIhA4g,10095
-tksheet/functions.py,sha256=qks2dLqBE9GMAuEXaA4qiU-rrL-dzmz4-tkmkp6_ETk,53037
-tksheet/main_table.py,sha256=_VFoj01R4mS-m7JoDLG_36zkprweFGh0TYMalRRK4rE,366788
-tksheet/other_classes.py,sha256=B2SrUAviztDUOPGoWkcu-AixqAaKwItshoVZPGe1_Tc,16662
+tksheet/functions.py,sha256=gwf9X9ENHmoikjbXtoj-00uUVQGRJVffkeJHoR7yB2E,52993
+tksheet/main_table.py,sha256=QOX7diYHRovSfq-RGUeEBXswnCmU0cMNPkd8f-QtHJk,366639
+tksheet/other_classes.py,sha256=1qsaUlxD8GbQupl9pefzP2tFM6z337uY4XkUXb0zRJw,18213
 tksheet/row_index.py,sha256=8zuNU00ATmz5oumEqSyB_nOUAIuCS23mUfTpq3R1WOM,141611
 tksheet/sheet.py,sha256=MXt-ebQJVx-l4lozRqCxhivMMaCC7JpOD7wzfVj0rRk,269777
 tksheet/sheet_options.py,sha256=ob-XYgGfBoi2TaFAvUUmlWUkw9xB-yXmJw17gu9__Lw,9948
@@ -14,9 +14,9 @@ tksheet/sorting.py,sha256=zcZPpRtP1h_xJGtGkG3E43H7deKQFnh9cMwZ1B2-aGc,17502
 tksheet/text_editor.py,sha256=rU8Fz0-ltkM63W9io2DoZJPyzUGzCc9Z0qBtc4D1H40,7404
 tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
 tksheet/tksheet_types.py,sha256=1MjXR34EmvP1KfHlLTvKKVnf0VMz_LU_WOM2q4o5hfI,4598
-tksheet/top_left_rectangle.py,sha256=M52IrPIeMoYE3jSpooZmqw_0W5Fz_R-Yu1ZqA685EZ8,8557
-tksheet-7.4.20.dist-info/licenses/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.4.20.dist-info/METADATA,sha256=esWuLkorvJ4si2jups_4X0Qrvg60SVupWtLRG1D89Og,8117
-tksheet-7.4.20.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-tksheet-7.4.20.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.4.20.dist-info/RECORD,,
+tksheet/top_left_rectangle.py,sha256=A4wWL8PFl57Pn2Ek71rASCE1-bW844cTl7bgt4tLWzI,8499
+tksheet-7.4.21.dist-info/licenses/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.4.21.dist-info/METADATA,sha256=aJV9Yll6JK0cvLEe-3r-0GYvFo8bkE-hZcmRdnG-WFI,8117
+tksheet-7.4.21.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+tksheet-7.4.21.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.4.21.dist-info/RECORD,,

{tksheet-7.4.20.dist-info → tksheet-7.4.21.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any