PyPI - tksheet - Versions diffs - 7.2.23__tar.gz → 7.3.1__tar.gz - Mend

tksheet 7.2.23tar.gz → 7.3.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

{tksheet-7.2.23/tksheet.egg-info → tksheet-7.3.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.23
+Version: 7.3.1
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -36,12 +36,14 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 <p align="center" width="100%">
-    <img width="33%" src="https://github.com/ragardner/tksheet/assets/26602401/4124c3ce-cf62-4925-9158-c5bdf712765b">
+    <img width="45%" src="https://github.com/user-attachments/assets/4afc1783-6461-4b98-93cb-b2a2a7f35169" alt="tksheet table">
+    <img width="45%"src="https://github.com/user-attachments/assets/08e77e89-00ea-4c52-9222-9bd421284360" alt="tksheet treeview">
 </p>
 # <div align="center">tksheet - python tkinter table widget</div>
@@ -50,14 +52,35 @@ License-File: LICENSE.txt
 [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
-|    **Help**       |                                                                  |
-|-------------------|------------------------------------------------------------------|
-| Versions 6.x.x -> | [Documentation Wiki](https://github.com/ragardner/tksheet/wiki/Version-6) | |
-| Versions 7.x.x -> | [Documentation Wiki](https://github.com/ragardner/tksheet/wiki/Version-7) | |
-| [Changelog](https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md) | |
-| [Questions](https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions) | |
-| [Issues](https://github.com/ragardner/tksheet/wiki/Version-7#issues) | |
-| [Suggestions](https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions) | |
+<table>
+  <thead>
+    <tr>
+      <th style="color: lightgreen" colspan=2><strong>Help</strong></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="color: LightCoral">Versions 6.x.x &#8594;</td>
+      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-6">Documentation Wiki</a></td>
+    </tr>
+    <tr>
+      <td style="color: lightgreen">Versions 7.x.x &#8594;</td>
+      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-7">Documentation Wiki</a></td>
+    </tr>
+    <tr>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md">Changelog</a></td>
+    </tr>
+    <tr>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions">Questions</a></td>
+    </tr>
+    <tr>
+      <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>
+    </tr>
+  </tbody>
+</table>
 This library is maintained with the help of **[others](https://github.com/ragardner/tksheet/graphs/contributors)**. If you would like to contribute please read this [help section](https://github.com/ragardner/tksheet/wiki/Version-7#contributing).
@@ -82,8 +105,10 @@ This library is maintained with the help of **[others](https://github.com/ragard
 - Expand row heights and column widths
 - Change fonts and font size (not for individual cells)
 - Change any colors in the sheet
-- Dropdowns, check boxes, progress bars
 - [Treeview mode](https://github.com/ragardner/tksheet/wiki/Version-7#treeview-mode)
+- [Dropdown boxes](https://github.com/ragardner/tksheet/wiki/Version-7#dropdown-boxes)
+- [Check boxes](https://github.com/ragardner/tksheet/wiki/Version-7#check-boxes)
+- [Progress bars](https://github.com/ragardner/tksheet/wiki/Version-7#progress-bars)
 - [Hide rows and/or columns](https://github.com/ragardner/tksheet/wiki/Version-7#example-header-dropdown-boxes-and-row-filtering)
 - Left `"w"`, Center `"center"` or Right `"e"` text alignment for any cell/row/column
@@ -117,4 +142,3 @@ sheet.delete_columns(columns=[0, 3], undo=True)
 ![tksheet treeview](https://github.com/user-attachments/assets/159ab987-7612-4db7-98de-1f30c9680247)

{tksheet-7.2.23 → tksheet-7.3.1}/README.md RENAMED Viewed

@@ -1,5 +1,6 @@
 <p align="center" width="100%">
-    <img width="33%" src="https://github.com/ragardner/tksheet/assets/26602401/4124c3ce-cf62-4925-9158-c5bdf712765b">
+    <img width="45%" src="https://github.com/user-attachments/assets/4afc1783-6461-4b98-93cb-b2a2a7f35169" alt="tksheet table">
+    <img width="45%"src="https://github.com/user-attachments/assets/08e77e89-00ea-4c52-9222-9bd421284360" alt="tksheet treeview">
 </p>
 # <div align="center">tksheet - python tkinter table widget</div>
@@ -8,14 +9,35 @@
 [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
-|    **Help**       |                                                                  |
-|-------------------|------------------------------------------------------------------|
-| Versions 6.x.x -> | [Documentation Wiki](https://github.com/ragardner/tksheet/wiki/Version-6) | |
-| Versions 7.x.x -> | [Documentation Wiki](https://github.com/ragardner/tksheet/wiki/Version-7) | |
-| [Changelog](https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md) | |
-| [Questions](https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions) | |
-| [Issues](https://github.com/ragardner/tksheet/wiki/Version-7#issues) | |
-| [Suggestions](https://github.com/ragardner/tksheet/wiki/Version-7#enhancements-or-suggestions) | |
+<table>
+  <thead>
+    <tr>
+      <th style="color: lightgreen" colspan=2><strong>Help</strong></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="color: LightCoral">Versions 6.x.x &#8594;</td>
+      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-6">Documentation Wiki</a></td>
+    </tr>
+    <tr>
+      <td style="color: lightgreen">Versions 7.x.x &#8594;</td>
+      <td><a href="https://github.com/ragardner/tksheet/wiki/Version-7">Documentation Wiki</a></td>
+    </tr>
+    <tr>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md">Changelog</a></td>
+    </tr>
+    <tr>
+      <td align="right" colspan="2"><a href="https://github.com/ragardner/tksheet/wiki/Version-7#asking-questions">Questions</a></td>
+    </tr>
+    <tr>
+      <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>
+    </tr>
+  </tbody>
+</table>
 This library is maintained with the help of **[others](https://github.com/ragardner/tksheet/graphs/contributors)**. If you would like to contribute please read this [help section](https://github.com/ragardner/tksheet/wiki/Version-7#contributing).
@@ -40,8 +62,10 @@ This library is maintained with the help of **[others](https://github.com/ragard
 - Expand row heights and column widths
 - Change fonts and font size (not for individual cells)
 - Change any colors in the sheet
-- Dropdowns, check boxes, progress bars
 - [Treeview mode](https://github.com/ragardner/tksheet/wiki/Version-7#treeview-mode)
+- [Dropdown boxes](https://github.com/ragardner/tksheet/wiki/Version-7#dropdown-boxes)
+- [Check boxes](https://github.com/ragardner/tksheet/wiki/Version-7#check-boxes)
+- [Progress bars](https://github.com/ragardner/tksheet/wiki/Version-7#progress-bars)
 - [Hide rows and/or columns](https://github.com/ragardner/tksheet/wiki/Version-7#example-header-dropdown-boxes-and-row-filtering)
 - Left `"w"`, Center `"center"` or Right `"e"` text alignment for any cell/row/column
@@ -75,4 +99,3 @@ sheet.delete_columns(columns=[0, 3], undo=True)
 ![tksheet treeview](https://github.com/user-attachments/assets/159ab987-7612-4db7-98de-1f30c9680247)

{tksheet-7.2.23 → tksheet-7.3.1}/pyproject.toml RENAMED Viewed

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.2.23"
+version = "7.3.1"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}
@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 [project.urls]

{tksheet-7.2.23 → tksheet-7.3.1}/tksheet/__init__.py RENAMED Viewed

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

{tksheet-7.2.23 → tksheet-7.3.1}/tksheet/column_headers.py RENAMED Viewed

@@ -28,10 +28,11 @@ from .functions import (
     consecutive_ranges,
     event_dict,
     get_n2a,
+    int_x_tuple,
     is_contiguous,
     new_tk_event,
-    stored_event_dict,
     rounded_box_coords,
+    stored_event_dict,
     try_binding,
 )
 from .other_classes import (
@@ -43,6 +44,9 @@ from .other_classes import (
 from .text_editor import (
     TextEditor,
 )
+from .types import (
+    AnyIter,
+)
 from .vars import (
     USER_OS,
     rc_binding,
@@ -61,7 +65,7 @@ class ColumnHeaders(tk.Canvas):
             highlightthickness=0,
         )
         self.PAR = kwargs["parent"]
-        self.current_height = None  # is set from within MainTable() __init__ or from Sheet parameters
+        self.current_height = None
         self.MT = None  # is set from within MainTable() __init__
         self.RI = None  # is set from within MainTable() __init__
         self.TL = None  # is set from within TopLeftRectangle() __init__
@@ -101,7 +105,6 @@ class ColumnHeaders(tk.Canvas):
         self.cell_options = {}
         self.rsz_w = None
         self.rsz_h = None
-        self.new_col_height = 0
         self.lines_start_at = 0
         self.currently_resizing_width = False
         self.currently_resizing_height = False
@@ -191,14 +194,17 @@ class ColumnHeaders(tk.Canvas):
             self.lines_start_at -= 1
         self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=False, redraw_table=False)
-    def set_height(self, new_height: int, set_TL: bool = False) -> None:
-        self.current_height = new_height
+    def set_height(self, new_height: int, set_TL: bool = False) -> bool:
         try:
             self.config(height=new_height)
         except Exception:
-            return
+            return False
         if set_TL and self.TL is not None:
             self.TL.set_dimensions(new_h=new_height)
+        if expanded := isinstance(self.current_height, int) and new_height > self.current_height:
+            self.MT.recreate_all_selection_boxes()
+        self.current_height = new_height
+        return expanded
     def rc(self, event: object) -> None:
         self.mouseclick_outside_editor_or_dropdown_all_canvases(inside=True)
@@ -471,12 +477,7 @@ class ColumnHeaders(tk.Canvas):
             )
             self.MT.create_resize_line(line2x, y1, line2x, y2, width=1, fill=self.PAR.ops.resizing_line_fg, tag="rwl2")
         elif self.height_resizing_enabled and self.rsz_w is None and self.rsz_h is not None:
-            x1, y1, x2, y2 = self.MT.get_canvas_visible_area()
             self.currently_resizing_height = True
-            y = event.y
-            if y < self.MT.min_header_height:
-                y = int(self.MT.min_header_height)
-            self.new_col_height = y
         elif self.MT.identify_col(x=event.x, allow_end=False) is None:
             self.MT.deselect("all")
         elif self.col_selection_enabled and self.rsz_w is None and self.rsz_h is None:
@@ -504,7 +505,7 @@ class ColumnHeaders(tk.Canvas):
         if self.width_resizing_enabled and self.rsz_w is not None and self.currently_resizing_width:
             x = self.canvasx(event.x)
             size = x - self.MT.col_positions[self.rsz_w - 1]
-            if size >= self.MT.min_column_width and size < self.MT.max_column_width:
+            if size >= self.PAR.ops.min_column_width and size < self.PAR.ops.max_column_width:
                 self.hide_resize_and_ctrl_lines(ctrl_lines=False)
                 line2x = self.MT.col_positions[self.rsz_w - 1]
                 self.create_resize_line(
@@ -539,17 +540,13 @@ class ColumnHeaders(tk.Canvas):
         elif self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
             evy = event.y
             if evy > self.current_height:
-                y = self.MT.canvasy(evy - self.current_height)
-                if evy > self.MT.max_header_height:
-                    evy = int(self.MT.max_header_height)
-                    y = self.MT.canvasy(evy - self.current_height)
-                self.new_col_height = evy
+                if evy > self.PAR.ops.max_header_height:
+                    evy = int(self.PAR.ops.max_header_height)
+                self.drag_height_resize(evy)
             else:
-                y = evy
-                if y < self.MT.min_header_height:
-                    y = int(self.MT.min_header_height)
-                self.new_col_height = y
-            self.drag_height_resize()
+                if evy < self.MT.min_header_height:
+                    evy = int(self.MT.min_header_height)
+                self.drag_height_resize(evy)
         elif (
             self.drag_and_drop_enabled
             and self.col_selection_enabled
@@ -596,9 +593,9 @@ class ColumnHeaders(tk.Canvas):
                 self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=False)
         try_binding(self.extra_b1_motion_func, event)
-    def drag_height_resize(self) -> None:
-        self.set_height(self.new_col_height, set_TL=True)
-        self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
+    def drag_height_resize(self, height: int) -> None:
+        if self.set_height(height, set_TL=True):
+            self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=False, redraw_table=False)
     def get_b1_motion_box(self, start_col: int, end_col: int) -> tuple[int, int, int, int, Literal["columns"]]:
         if end_col >= start_col:
@@ -781,10 +778,10 @@ class ColumnHeaders(tk.Canvas):
         new_col_pos = int(self.coords("rwl")[0])
         old_width = self.MT.col_positions[self.rsz_w] - self.MT.col_positions[self.rsz_w - 1]
         size = new_col_pos - self.MT.col_positions[self.rsz_w - 1]
-        if size < self.MT.min_column_width:
-            new_col_pos = ceil(self.MT.col_positions[self.rsz_w - 1] + self.MT.min_column_width)
-        elif size > self.MT.max_column_width:
-            new_col_pos = floor(self.MT.col_positions[self.rsz_w - 1] + self.MT.max_column_width)
+        if size < self.PAR.ops.min_column_width:
+            new_col_pos = ceil(self.MT.col_positions[self.rsz_w - 1] + self.PAR.ops.min_column_width)
+        elif size > self.PAR.ops.max_column_width:
+            new_col_pos = floor(self.MT.col_positions[self.rsz_w - 1] + self.PAR.ops.max_column_width)
         increment = new_col_pos - self.MT.col_positions[self.rsz_w]
         self.MT.col_positions[self.rsz_w + 1 :] = [
             e + increment for e in islice(self.MT.col_positions, self.rsz_w + 1, None)
@@ -820,9 +817,6 @@ class ColumnHeaders(tk.Canvas):
             self.drag_width_resize()
             self.currently_resizing_width = False
             self.hide_resize_and_ctrl_lines(ctrl_lines=False)
-        elif self.height_resizing_enabled and self.rsz_h is not None and self.currently_resizing_height:
-            self.currently_resizing_height = False
-            self.drag_height_resize()
         elif (
             self.drag_and_drop_enabled
             and self.col_selection_enabled
@@ -938,20 +932,31 @@ class ColumnHeaders(tk.Canvas):
     def select_col(
         self,
-        c: int,
+        c: int | AnyIter[int],
         redraw: bool = False,
         run_binding_func: bool = True,
         ext: bool = False,
-    ) -> int:
+    ) -> int | list[int]:
         boxes_to_hide = tuple(self.MT.selection_boxes)
-        fill_iid = self.MT.create_selection_box(0, c, len(self.MT.row_positions) - 1, c + 1, "columns", ext=ext)
+        fill_iids = [
+            self.MT.create_selection_box(
+                0,
+                start,
+                len(self.MT.row_positions) - 1,
+                end,
+                "columns",
+                set_current=True,
+                ext=ext,
+            )
+            for start, end in consecutive_ranges(int_x_tuple(c))
+        ]
         for iid in boxes_to_hide:
             self.MT.hide_selection_box(iid)
         if redraw:
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
         if run_binding_func:
             self.MT.run_selection_binding("columns")
-        return fill_iid
+        return fill_iids[0] if len(fill_iids) == 1 else fill_iids
     def add_selection(
         self,
@@ -1019,7 +1024,7 @@ class ColumnHeaders(tk.Canvas):
             w = b[2] - b[0] + 7
             h = b[3] - b[1] + 5
         else:
-            w = self.MT.min_column_width
+            w = self.PAR.ops.min_column_width
             h = self.MT.min_header_height
         if datacn in self.cell_options and (
             self.get_cell_kwargs(datacn, key="dropdown") or self.get_cell_kwargs(datacn, key="checkbox")
@@ -1077,8 +1082,8 @@ class ColumnHeaders(tk.Canvas):
             h = space_bot
         if h < self.MT.min_header_height:
             h = int(self.MT.min_header_height)
-        elif h > self.MT.max_header_height:
-            h = int(self.MT.max_header_height)
+        elif h > self.PAR.ops.max_header_height:
+            h = int(self.PAR.ops.max_header_height)
         if not only_if_too_small or (only_if_too_small and h > self.current_height):
             self.set_height(h, set_TL=True)
             self.MT.main_table_redraw_grid_and_text(redraw_header=True, redraw_row_index=True)
@@ -1091,7 +1096,7 @@ class ColumnHeaders(tk.Canvas):
         only_if_too_small: bool = False,
     ) -> int:
         self.fix_header()
-        w = self.MT.min_column_width
+        w = self.PAR.ops.min_column_width
         datacn = col if self.MT.all_columns_displayed else self.MT.displayed_columns[col]
         # header
         hw, hh_ = self.get_cell_dimensions(datacn)
@@ -1128,10 +1133,10 @@ class ColumnHeaders(tk.Canvas):
             w = hw
         if only_if_too_small and w < self.MT.col_positions[col + 1] - self.MT.col_positions[col]:
             w = self.MT.col_positions[col + 1] - self.MT.col_positions[col]
-        if w <= self.MT.min_column_width:
-            w = int(self.MT.min_column_width)
-        elif w > self.MT.max_column_width:
-            w = int(self.MT.max_column_width)
+        if w <= self.PAR.ops.min_column_width:
+            w = self.PAR.ops.min_column_width
+        elif w > self.PAR.ops.max_column_width:
+            w = int(self.PAR.ops.max_column_width)
         return w
     def set_col_width(
@@ -1144,10 +1149,10 @@ class ColumnHeaders(tk.Canvas):
     ) -> int:
         if width is None:
             width = self.get_col_text_width(col=col, visible_only=visible_only)
-        if width <= self.MT.min_column_width:
-            width = int(self.MT.min_column_width)
-        elif width > self.MT.max_column_width:
-            width = int(self.MT.max_column_width)
+        if width <= self.PAR.ops.min_column_width:
+            width = self.PAR.ops.min_column_width
+        elif width > self.PAR.ops.max_column_width:
+            width = int(self.PAR.ops.max_column_width)
         if only_if_too_small and width <= self.MT.col_positions[col + 1] - self.MT.col_positions[col]:
             return self.MT.col_positions[col + 1] - self.MT.col_positions[col]
         new_col_pos = self.MT.col_positions[col] + width

{tksheet-7.2.23 → tksheet-7.3.1}/tksheet/functions.py RENAMED Viewed

@@ -12,6 +12,8 @@ from collections import deque
 from collections.abc import (
     Callable,
     Generator,
+    Hashable,
+    Iterable,
     Iterator,
     Sequence,
 )
@@ -30,6 +32,9 @@ from .other_classes import (
     Loc,
     Span,
 )
+from .types import (
+    AnyIter,
+)
 unpickle_obj = pickle.loads
@@ -119,6 +124,12 @@ def dropdown_search_function(
     return None
+def float_to_int(f: int | float) -> int | float:
+    if f == float("inf"):
+        return f
+    return int(f)
 def selection_box_tup_to_dict(box: tuple) -> dict:
     return {Box_nt(*box[:-1]): box[-1]}
@@ -289,13 +300,19 @@ def is_iterable(o: object) -> bool:
         return False
-def int_x_iter(i: Iterator[int] | int) -> Iterator[int]:
+def int_x_iter(i: AnyIter[int] | int) -> AnyIter[int]:
     if isinstance(i, int):
         return (i,)
     return i
-def unpack(t: tuple[object] | tuple[Iterator[object]]) -> tuple[object]:
+def int_x_tuple(i: AnyIter[int] | int) -> tuple[int]:
+    if isinstance(i, int):
+        return (i,)
+    return tuple(i)
+def unpack(t: tuple[object] | tuple[AnyIter[object]]) -> tuple[object]:
     if not len(t):
         return t
     if is_iterable(t[0]) and len(t) == 1:
@@ -421,7 +438,7 @@ def consecutive_ranges(seq: Sequence[int]) -> Generator[tuple[int, int]]:
             yield seq[start], seq[-1] + 1
-def is_contiguous(iterable: Iterator[int]) -> bool:
+def is_contiguous(iterable: Iterable[int]) -> bool:
     itr = iter(iterable)
     prev = next(itr)
     return all(i == (prev := prev + 1) for i in itr)
@@ -494,7 +511,7 @@ def cell_right_within_box(
 def get_last(
-    it: Iterator,
+    it: AnyIter[object],
 ) -> object:
     if hasattr(it, "__reversed__"):
         try:
@@ -516,7 +533,7 @@ def index_exists(seq: Sequence[object], index: int) -> bool:
         return False
-def add_to_displayed(displayed: list[int], to_add: Iterator[int]) -> list[int]:
+def add_to_displayed(displayed: list[int], to_add: Iterable[int]) -> list[int]:
     # assumes to_add is sorted in reverse
     for i in reversed(to_add):
         ins = bisect_left(displayed, i)
@@ -698,7 +715,7 @@ def diff_gen(seq: list[float]) -> Generator[int]:
     )
-def zip_fill_2nd_value(x: Iterator, o: object) -> Generator[object, object]:
+def zip_fill_2nd_value(x: AnyIter[object], o: object) -> Generator[object, object]:
     return zip(x, repeat(o))
@@ -1227,13 +1244,13 @@ def span_froms(
     return from_r, from_c
-def del_named_span_options(options: dict, itr: Iterator, type_: str) -> None:
+def del_named_span_options(options: dict, itr: AnyIter[Hashable], type_: str) -> None:
     for k in itr:
         if k in options and type_ in options[k]:
             del options[k][type_]
-def del_named_span_options_nested(options: dict, itr1: Iterator, itr2: Iterator, type_: str) -> None:
+def del_named_span_options_nested(options: dict, itr1: AnyIter[Hashable], itr2: AnyIter[Hashable], type_: str) -> None:
     for k1 in itr1:
         for k2 in itr2:
             k = (k1, k2)
@@ -1314,7 +1331,7 @@ def set_align(
 def del_from_options(
     options: dict,
     key: str,
-    coords: int | Iterator | None = None,
+    coords: int | AnyIter[int | tuple[int, int]] | None = None,
 ) -> dict:
     if isinstance(coords, int):
         if coords in options and key in options[coords]:

tksheet 7.2.23__tar.gz → 7.3.1__tar.gz

tksheet 7.2.23tar.gz → 7.3.1tar.gz