tksheet 7.4.1__tar.gz → 7.4.2__tar.gz

{tksheet-7.4.1/tksheet.egg-info → tksheet-7.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.1
+Version: 7.4.2
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -77,7 +77,7 @@ License-File: LICENSE.txt
       <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues">Issues</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions and Contributors</a></td>
     </tr>
   </tbody>
 </table>

{tksheet-7.4.1 → tksheet-7.4.2}/README.md

@@ -34,7 +34,7 @@
       <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues">Issues</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions and Contributors</a></td>
     </tr>
   </tbody>
 </table>

{tksheet-7.4.1 → tksheet-7.4.2}/pyproject.toml

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

{tksheet-7.4.1 → tksheet-7.4.2}/tksheet/__init__.py

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

{tksheet-7.4.1 → tksheet-7.4.2}/tksheet/column_headers.py

@@ -915,14 +915,14 @@ class ColumnHeaders(tk.Canvas):
         key: Callable | None = None,
         undo: bool = True,
     ) -> EventDataDict:
-        event_data = self.MT.new_event_dict("sort_rows", state=True)
+        event_data = self.MT.new_event_dict("move_rows", state=True)
         if not self.MT.data:
             return event_data
         if column is None:
             if not self.MT.selected:
                 return event_data
             column = self.MT.selected.column
-        if try_binding(self.ch_extra_begin_sort_rows_func, event_data, "begin_sort_rows"):
+        if try_binding(self.ch_extra_begin_sort_rows_func, event_data, "begin_move_rows"):
             disp_new_idxs, disp_row_ctr = {}, 0
             if self.ops.treeview:
                 new_nodes_order, data_new_idxs = sort_tree_view(
@@ -973,7 +973,7 @@ class ColumnHeaders(tk.Canvas):
             }
             if undo and self.MT.undo_enabled:
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            try_binding(self.ch_extra_end_sort_rows_func, event_data, "end_sort_rows")
+            try_binding(self.ch_extra_end_sort_rows_func, event_data, "end_move_rows")
             self.MT.sheet_modified(event_data)
             self.PAR.emit_event("<<SheetModified>>", event_data)
             self.MT.refresh()

{tksheet-7.4.1 → tksheet-7.4.2}/tksheet/row_index.py

@@ -936,14 +936,14 @@ class RowIndex(tk.Canvas):
         key: Callable | None = None,
         undo: bool = True,
     ) -> EventDataDict:
-        event_data = self.MT.new_event_dict("sort_columns", state=True)
+        event_data = self.MT.new_event_dict("move_columns", state=True)
         if not self.MT.data:
             return event_data
         if row is None:
             if not self.MT.selected:
                 return event_data
             row = self.MT.selected.row
-        if try_binding(self.ri_extra_begin_sort_cols_func, event_data, "begin_sort_columns"):
+        if try_binding(self.ri_extra_begin_sort_cols_func, event_data, "begin_move_columns"):
             sorted_indices, data_new_idxs = sort_columns_by_row(self.MT.data, row=row, reverse=reverse, key=key)
             disp_new_idxs = {}
             if self.MT.all_columns_displayed:
@@ -970,7 +970,7 @@ class RowIndex(tk.Canvas):
             }
             if undo and self.MT.undo_enabled:
                 self.MT.undo_stack.append(stored_event_dict(event_data))
-            try_binding(self.ri_extra_end_sort_cols_func, event_data, "end_sort_columns")
+            try_binding(self.ri_extra_end_sort_cols_func, event_data, "end_move_columns")
             self.MT.sheet_modified(event_data)
             self.PAR.emit_event("<<SheetModified>>", event_data)
             self.MT.refresh()

{tksheet-7.4.1 → tksheet-7.4.2}/tksheet/sorting.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from collections.abc import Callable, Generator
+from collections.abc import Callable, Generator, Iterable, Iterator
 from datetime import datetime
+from pathlib import Path
 from re import finditer
 
-from .other_classes import Node
-from .tksheet_types import AnyIter
+AnyIter = Iterable | Iterator
 
 # Possible date formats to try for the entire string
 date_formats = [
@@ -45,24 +45,27 @@ date_formats = [
 ]
 
 
-def natural_sort_key(item: object) -> tuple[int, object]:
+def natural_sort_key(
+    item: object,
+) -> tuple[int, ...]:
     """
-    A key function for natural sorting that handles various Python types, including
-    date-like strings in multiple formats.
-
-    This function aims to sort elements in a human-readable order:
-    - None values first
-    - Booleans (False before True)
-    - Numbers (integers, floats combined)
-    - Datetime objects
-    - Strings with natural sorting for embedded numbers and dates
-    - Unknown types treated as strings or left at the end
-
-    Args:
-        item: Any Python object to be sorted.
-
-    Returns:
-        A tuple or value that can be used for sorting.
+    A key for natural sorting of various Python types.
+
+    This function returns a tuple where the first element is an integer
+    ranking the type, followed by type-specific comparison values.
+
+    1. None
+    2. bool
+    3. int, float
+    4. datetime
+    5. filepaths
+    6. empty strings
+    7. strings
+    8. unknown objects with __str__ method
+    9. unknown objects
+
+    :param item: Any Python object to be sorted.
+    :return: A tuple for sorting, with type indicator and comparison values.
     """
     if item is None:
         return (0,)
@@ -76,31 +79,39 @@ def natural_sort_key(item: object) -> tuple[int, object]:
     elif isinstance(item, datetime):
         return (3, item.timestamp())
 
+    elif isinstance(item, Path):
+        return (4, item.as_posix())
+
     elif isinstance(item, str):
-        for date_format in date_formats:
+        if not item:
+            return (5, item)
+
+        else:
+            for date_format in date_formats:
+                try:
+                    return (3, datetime.strptime(item, date_format).timestamp())
+                except ValueError:
+                    continue
+
             try:
-                return (3, datetime.strptime(item, date_format).timestamp())
-            except ValueError:
-                continue
+                return (2, float(item))
+            except Exception:
+                pass
 
-        try:
-            return (2, float(item))
-        except Exception:
-            n = []
-            s = []
-            for match in finditer(r"\d+|[^\d\s]+", item):
-                if (m := match.group()).isdigit():
-                    n.append(int(m))
-                else:
-                    s.append(m.lower())
-            return (5, s, n)
+            if "/" in item or "\\" in item:
+                try:
+                    return (4, Path(item).as_posix())
+                except Exception:
+                    pass
+
+            return (6, item.lower(), tuple(int(match.group()) for match in finditer(r"\d+", item)))
 
+    # For unknown types, attempt to convert to string, or place at end
     else:
-        # For unknown types, attempt to convert to string, or place at end
         try:
-            return (6, f"{item}".lower())
+            return (7, f"{item}".lower())
         except Exception:
-            return (7, item)
+            return (8, item)
 
 
 def sort_selection(
@@ -233,11 +244,11 @@ def sort_columns_by_row(
 
 
 def _sort_node_children(
-    node: Node,
-    tree: dict[str, Node],
+    node: object,
+    tree: dict[str, object],
     reverse: bool,
     key: Callable,
-) -> Generator[Node, None, None]:
+) -> Generator[object, None, None]:
     sorted_children = sorted(
         (tree[child_iid] for child_iid in node.children if child_iid in tree),
         key=lambda child: key(child.text),
@@ -250,12 +261,12 @@ def _sort_node_children(
 
 
 def sort_tree_view(
-    _row_index: list[Node],
+    _row_index: list[object],
     tree_rns: dict[str, int],
-    tree: dict[str, Node],
+    tree: dict[str, object],
     key: Callable = natural_sort_key,
     reverse: bool = False,
-) -> tuple[list[Node], dict[int, int]]:
+) -> tuple[list[object], dict[int, int]]:
     if not _row_index or not tree_rns or not tree:
         return [], {}
 
@@ -285,3 +296,40 @@ def sort_tree_view(
             new_index += 1
 
     return sorted_nodes, mapping
+
+
+# def test_natural_sort_key():
+#     test_items = [
+#         None,
+#         False,
+#         True,
+#         5,
+#         3.14,
+#         datetime(2023, 1, 1),
+#         "abc123",
+#         "123abc",
+#         "abc123def",
+#         "998zzz",
+#         "10-01-2023",
+#         "01-10-2023",
+#         "fi1le_0.txt",
+#         "file_2.txt",
+#         "file_10.txt",
+#         "file_1.txt",
+#         "path/to/file_2.txt",
+#         "path/to/file_10.txt",
+#         "path/to/file_1.txt",
+#         "/another/path/file_2.log",
+#         "/another/path/file_10.log",
+#         "/another/path/file_1.log",
+#         "C:\\Windows\\System32\\file_2.dll",
+#         "C:\\Windows\\System32\\file_10.dll",
+#         "C:\\Windows\\System32\\file_1.dll",
+#     ]
+#     print("Sort objects:", [natural_sort_key(e) for e in test_items])
+#     sorted_items = sorted(test_items, key=natural_sort_key)
+#     print("\nNatural Sort Order:", sorted_items)
+
+
+# if __name__ == "__main__":
+#     test_natural_sort_key()

{tksheet-7.4.1 → tksheet-7.4.2/tksheet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.1
+Version: 7.4.2
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -77,7 +77,7 @@ License-File: LICENSE.txt
       <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#issues">Issues</a></td>
     </tr>
     <tr>
-      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions</a></td>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions">Suggestions and Contributors</a></td>
     </tr>
   </tbody>
 </table>