tksheet 7.2.19__tar.gz → 7.2.20__tar.gz

{tksheet-7.2.19/tksheet.egg-info → tksheet-7.2.20}/PKG-INFO

@@ -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.19 → tksheet-7.2.20}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.2.19"
+version = "7.2.20"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.2.19 → tksheet-7.2.20}/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-7.2.19 → tksheet-7.2.20}/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-7.2.19 → tksheet-7.2.20}/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-7.2.19 → tksheet-7.2.20}/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-7.2.19 → tksheet-7.2.20}/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-7.2.19 → tksheet-7.2.20}/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-7.2.19 → tksheet-7.2.20}/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 → tksheet-7.2.20/tksheet.egg-info}/PKG-INFO

@@ -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