tksheet 7.2.19__py3-none-any.whl → 7.2.20__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.2.19"
+__version__ = "7.2.20"
 
 from .colors import (
     color_map,
@@ -12,6 +12,8 @@ from .colors import (
 from .column_headers import ColumnHeaders
 from .formatters import (
     Formatter,
+    alt_percentage_to_str,
+    alt_to_percentage,
     bool_formatter,
     data_to_str,
     float_formatter,
@@ -28,6 +30,7 @@ from .formatters import (
     to_bool,
     to_float,
     to_int,
+    to_percentage,
     to_str,
     try_to_bool,
 )

tksheet/column_headers.py

@@ -56,8 +56,7 @@ from .vars import (
 
 class ColumnHeaders(tk.Canvas):
     def __init__(self, *args, **kwargs):
-        tk.Canvas.__init__(
-            self,
+        super().__init__(
             kwargs["parent"],
             background=kwargs["parent"].ops.header_bg,
             highlightthickness=0,

tksheet/formatters.py

@@ -5,19 +5,25 @@ from collections.abc import Callable
 from .vars import falsy, nonelike, truthy
 
 
-def is_none_like(o: object):
+def is_none_like(o: object) -> bool:
     if (isinstance(o, str) and o.lower().replace(" ", "") in nonelike) or o in nonelike:
         return True
     return False
 
 
-def to_int(o: object, **kwargs):
+def to_int(o: object, **kwargs) -> int:
     if isinstance(o, int):
         return o
     return int(float(o))
 
 
-def to_float(o: object, **kwargs):
+def to_float(o: object, **kwargs) -> float:
+    if isinstance(o, float):
+        return o
+    return float(o)
+
+
+def to_percentage(o: object, **kwargs) -> float:
     if isinstance(o, float):
         return o
     if isinstance(o, str) and o.endswith("%"):
@@ -25,7 +31,15 @@ def to_float(o: object, **kwargs):
     return float(o)
 
 
-def to_bool(val: object, **kwargs):
+def alt_to_percentage(o: object, **kwargs) -> float:
+    if isinstance(o, float):
+        return o
+    if isinstance(o, str) and o.endswith("%"):
+        return float(o.replace("%", ""))
+    return float(o)
+
+
+def to_bool(val: object, **kwargs) -> bool:
     if isinstance(val, bool):
         return val
     if isinstance(val, str):
@@ -47,14 +61,14 @@ def to_bool(val: object, **kwargs):
     raise ValueError(f'Cannot map "{val}" to bool.')
 
 
-def try_to_bool(o: object, **kwargs):
+def try_to_bool(o: object, **kwargs) -> object:
     try:
         return to_bool(o)
     except Exception:
         return o
 
 
-def is_bool_like(o: object, **kwargs):
+def is_bool_like(o: object, **kwargs) -> bool:
     try:
         to_bool(o)
         return True
@@ -91,6 +105,10 @@ def percentage_to_str(v: object, **kwargs: dict) -> str:
     return f"{v}%"
 
 
+def alt_percentage_to_str(v: object, **kwargs: dict) -> str:
+    return f"{float_to_str(v)}%"
+
+
 def bool_to_str(v: object, **kwargs: dict) -> str:
     return f"{v}"
 
@@ -127,7 +145,7 @@ def float_formatter(
 
 def percentage_formatter(
     datatypes: tuple[object] | object = float,
-    format_function: Callable = to_float,
+    format_function: Callable = to_percentage,
     to_str_function: Callable = percentage_to_str,
     decimals: int = 2,
     **kwargs,

tksheet/main_table.py

@@ -115,8 +115,7 @@ from .vars import (
 
 class MainTable(tk.Canvas):
     def __init__(self, *args, **kwargs):
-        tk.Canvas.__init__(
-            self,
+        super().__init__(
             kwargs["parent"],
             background=kwargs["parent"].ops.table_bg,
             highlightthickness=0,
@@ -671,8 +670,6 @@ class MainTable(tk.Canvas):
                                 event_data,
                             )
                     writer.writerow(row)
-        if event_data["cells"]["table"]:
-            self.undo_stack.append(pickled_event_dict(event_data))
         self.clipboard_clear()
         if len(event_data["cells"]["table"]) == 1 and self.PAR.ops.to_clipboard_lineterminator not in next(
             iter(event_data["cells"]["table"].values())
@@ -685,9 +682,10 @@ class MainTable(tk.Canvas):
         for r1, c1, r2, c2 in boxes:
             self.show_ctrl_outline(canvas="table", start_cell=(c1, r1), end_cell=(c2, r2))
         if event_data["cells"]["table"]:
+            self.undo_stack.append(pickled_event_dict(event_data))
             try_binding(self.extra_end_ctrl_x_func, event_data, "end_ctrl_x")
-        self.sheet_modified(event_data)
-        self.PAR.emit_event("<<Cut>>", event_data)
+            self.sheet_modified(event_data)
+            self.PAR.emit_event("<<Cut>>", event_data)
         return event_data
 
     def ctrl_v(self, event: object = None, validation: bool = True) -> None | EventDataDict:
@@ -937,8 +935,6 @@ class MainTable(tk.Canvas):
         )
         event_data["selection_boxes"] = self.get_boxes()
         event_data["selected"] = self.selected
-        if event_data["cells"]["table"] or event_data["added"]["rows"] or event_data["added"]["columns"]:
-            self.undo_stack.append(pickled_event_dict(event_data))
         self.see(
             r=selected_r,
             c=selected_c,
@@ -950,9 +946,10 @@ class MainTable(tk.Canvas):
         )
         self.refresh()
         if event_data["cells"]["table"] or event_data["added"]["rows"] or event_data["added"]["columns"]:
+            self.undo_stack.append(pickled_event_dict(event_data))
             try_binding(self.extra_end_ctrl_v_func, event_data, "end_ctrl_v")
-        self.sheet_modified(event_data)
-        self.PAR.emit_event("<<Paste>>", event_data)
+            self.sheet_modified(event_data)
+            self.PAR.emit_event("<<Paste>>", event_data)
         return event_data
 
     def delete_key(self, event: object = None, validation: bool = True) -> None | EventDataDict:
@@ -988,11 +985,11 @@ class MainTable(tk.Canvas):
                             event_data,
                         )
         if event_data["cells"]["table"]:
+            self.refresh()
             self.undo_stack.append(pickled_event_dict(event_data))
             try_binding(self.extra_end_delete_key_func, event_data, "end_delete")
-        self.refresh()
-        self.sheet_modified(event_data)
-        self.PAR.emit_event("<<Delete>>", event_data)
+            self.sheet_modified(event_data)
+            self.PAR.emit_event("<<Delete>>", event_data)
         return event_data
 
     def event_data_set_cell(self, datarn: int, datacn: int, value: object, event_data: dict) -> EventDataDict:

tksheet/row_index.py

@@ -66,8 +66,7 @@ from .vars import (
 
 class RowIndex(tk.Canvas):
     def __init__(self, *args, **kwargs):
-        tk.Canvas.__init__(
-            self,
+        super().__init__(
             kwargs["parent"],
             background=kwargs["parent"].ops.index_bg,
             highlightthickness=0,

tksheet/sheet.py

@@ -289,8 +289,7 @@ class Sheet(tk.Frame):
         row_index_width: int | None = None,
         expand_sheet_if_paste_too_big: bool | None = None,
     ) -> None:
-        tk.Frame.__init__(
-            self,
+        super().__init__(
             parent,
             background=frame_bg,
             highlightthickness=outline_thickness,

tksheet/text_editor.py

@@ -22,8 +22,7 @@ class TextEditorTkText(tk.Text):
         parent: tk.Misc,
         newline_binding: None | Callable = None,
     ) -> None:
-        tk.Text.__init__(
-            self,
+        super().__init__(
             parent,
             spacing1=0,
             spacing2=1,
@@ -170,8 +169,7 @@ class TextEditor(tk.Frame):
         parent: tk.Misc,
         newline_binding: None | Callable = None,
     ) -> None:
-        tk.Frame.__init__(
-            self,
+        super().__init__(
             parent,
             width=0,
             height=0,

{tksheet-7.2.19.dist-info → tksheet-7.2.20.dist-info}/METADATA

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

tksheet-7.2.20.dist-info/RECORD

@@ -0,0 +1,20 @@
+tksheet/__init__.py,sha256=LFB6RLXByzaiFRyaeQYjbIcN5EE9e-vzpjzqMGJi6FA,2237
+tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
+tksheet/column_headers.py,sha256=LtWvogLqd76JpkG_Vp2XQKoyxqkDjfcx2w-hzVVWPi8,102187
+tksheet/formatters.py,sha256=_exO2KnjtcnE_MVWLG1ngOZ-wmrXZhuh7uEi2iPs1Tk,10546
+tksheet/functions.py,sha256=P7nyiL5Q4nGmWo6CgPz0g2Vn56QclmOkniPDRFUNfTI,42768
+tksheet/main_table.py,sha256=x-3gKhAB-aZXSSmlu5cy2_FiUkNAQcWB40s3-41xRiU,332289
+tksheet/other_classes.py,sha256=eB-kDTJjYOe5QcSA25Bg9JS2JimZau2fAvyz8rcBT0Q,15631
+tksheet/row_index.py,sha256=5biQK0Rv3tq5nI98htOeiyEXYpuhiz_gQIWTYfrAJkM,111174
+tksheet/sheet.py,sha256=Wd2PjnMh-NQl-8hkEbwLLrmHhLdz1lSJAznyyXRECiM,283226
+tksheet/sheet_options.py,sha256=XM3XSWWVnAOctP2z2_WkkXonoIT8_brXwJaSO0sFZbE,12788
+tksheet/text_editor.py,sha256=pf9o3JuRI6cbr7ZoVfaookCBJsmRBgGDubdtShLZXBA,7064
+tksheet/themes.py,sha256=OhUzZL4JH0YPhb2f1F62CcJFzhVsEvNxF-ObC9zVb44,14474
+tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
+tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
+tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
+tksheet-7.2.20.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.2.20.dist-info/METADATA,sha256=YGaZ0fM_GcLhPCZ_KWkL8JNGdEwYWcGx74ar1MUbJZI,6476
+tksheet-7.2.20.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+tksheet-7.2.20.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.2.20.dist-info/RECORD,,

{tksheet-7.2.19.dist-info → tksheet-7.2.20.dist-info}/WHEEL

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

tksheet-7.2.19.dist-info/RECORD

@@ -1,20 +0,0 @@
-tksheet/__init__.py,sha256=UsF3O0h1sHVKInJEx2LacaojWXG47p8uUduX7lWjt7o,2165
-tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=9ub7pF0F3HJppOaJ1y1_Ri6F4l7YYO9eo6XeQCbgP00,102208
-tksheet/formatters.py,sha256=DfsekFfOiNKZuIqk1xD7IUiO8W9HIeCSaB6zMwsDv40,10051
-tksheet/functions.py,sha256=P7nyiL5Q4nGmWo6CgPz0g2Vn56QclmOkniPDRFUNfTI,42768
-tksheet/main_table.py,sha256=me7dkHYma49b16e4ygc_jBum3JfGG-j4oK1dbNQb9xo,332431
-tksheet/other_classes.py,sha256=eB-kDTJjYOe5QcSA25Bg9JS2JimZau2fAvyz8rcBT0Q,15631
-tksheet/row_index.py,sha256=Hcgqi04YFNx_0S4pMko8Jf7idIFRqJdlEEy_WCX0DvI,111195
-tksheet/sheet.py,sha256=XuFqVOljwrdM5IYpm5NwT_oyVn9iOkPKABtQ2GQ8ziM,283246
-tksheet/sheet_options.py,sha256=XM3XSWWVnAOctP2z2_WkkXonoIT8_brXwJaSO0sFZbE,12788
-tksheet/text_editor.py,sha256=lmmHOPb11S8tlNtC10vijF1QqVB5Ts2hUKnGJd_JkWA,7103
-tksheet/themes.py,sha256=OhUzZL4JH0YPhb2f1F62CcJFzhVsEvNxF-ObC9zVb44,14474
-tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
-tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
-tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
-tksheet-7.2.19.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.2.19.dist-info/METADATA,sha256=Df7jqZRsrUMBTHgI-1_fIncmszk1asde1sohy3z8YXw,6476
-tksheet-7.2.19.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-tksheet-7.2.19.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.2.19.dist-info/RECORD,,