tksheet 7.4.8__tar.gz → 7.4.9__tar.gz

{tksheet-7.4.8/tksheet.egg-info → tksheet-7.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.8
+Version: 7.4.9
 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.8 → tksheet-7.4.9}/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.8"
+version = "7.4.9"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.4.8 → tksheet-7.4.9}/tksheet/__init__.py

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

{tksheet-7.4.8 → tksheet-7.4.9}/tksheet/column_headers.py

@@ -1094,7 +1094,7 @@ class ColumnHeaders(tk.Canvas):
             self.itemconfig(item, state="hidden")
 
     def get_cell_dimensions(self, datacn: int) -> tuple[int, int]:
-        txt = self.get_valid_cell_data_as_str(datacn, fix=False)
+        txt = self.cell_str(datacn, fix=False)
         if txt:
             self.MT.txt_measure_canvas.itemconfig(
                 self.MT.txt_measure_canvas_text,
@@ -1150,7 +1150,7 @@ class ColumnHeaders(tk.Canvas):
             elif isinstance(self.MT._headers, int):
                 datarn = self.MT._headers
                 for datacn in iterable:
-                    if txt := self.MT.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True):
+                    if txt := self.MT.cell_str(datarn, datacn, get_displayed=True):
                         qconf(qtxtm, text=txt, font=qfont)
                         b = qbbox(qtxtm)
                         th = b[3] - b[1] + 5
@@ -1197,7 +1197,7 @@ class ColumnHeaders(tk.Canvas):
             qtxth = self.MT.table_txt_height
             qfont = self.ops.table_font
             for datarn in iterable:
-                if txt := self.MT.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True):
+                if txt := self.MT.cell_str(datarn, datacn, get_displayed=True):
                     qconf(qtxtm, text=txt, font=qfont)
                     b = qbbox(qtxtm)
                     if (
@@ -1629,7 +1629,7 @@ class ColumnHeaders(tk.Canvas):
                 or (align.endswith("n") and cleftgridln + 5 > scrollpos_right)
             ):
                 continue
-            text = self.get_valid_cell_data_as_str(datacn, fix=False)
+            text = self.cell_str(datacn, fix=False)
             if not text:
                 continue
             max_lines = int((self.current_height - top - 2) / txt_h)
@@ -2223,7 +2223,7 @@ class ColumnHeaders(tk.Canvas):
                 edited = True
         if edited and cell_resize and self.ops.cell_auto_resize_enabled:
             if self.height_resizing_enabled:
-                self.set_height_of_header_to_text(self.get_valid_cell_data_as_str(datacn, fix=False))
+                self.set_height_of_header_to_text(self.cell_str(datacn, fix=False))
             self.set_col_width_run_binding(c)
         if redraw:
             self.MT.refresh()
@@ -2270,7 +2270,7 @@ class ColumnHeaders(tk.Canvas):
         redirect_int: bool = False,
     ) -> Any:
         if get_displayed:
-            return self.get_valid_cell_data_as_str(datacn, fix=False)
+            return self.cell_str(datacn, fix=False)
         if redirect_int and isinstance(self.MT._headers, int):  # internal use
             return self.MT.get_cell_data(self.MT._headers, datacn, none_to_empty_str=True)
         if (
@@ -2282,7 +2282,7 @@ class ColumnHeaders(tk.Canvas):
             return ""
         return self.MT._headers[datacn]
 
-    def get_valid_cell_data_as_str(self, datacn: int, fix: bool = True) -> str:
+    def cell_str(self, datacn: int, fix: bool = True) -> str:
         kwargs = self.get_cell_kwargs(datacn, key="dropdown")
         if kwargs:
             if kwargs["text"] is not None:
@@ -2292,7 +2292,7 @@ class ColumnHeaders(tk.Canvas):
             if kwargs:
                 return f"{kwargs['text']}"
         if isinstance(self.MT._headers, int):
-            return self.MT.get_valid_cell_data_as_str(self.MT._headers, datacn, get_displayed=True)
+            return self.MT.cell_str(self.MT._headers, datacn, get_displayed=True)
         if fix:
             self.fix_header(datacn)
         try:

{tksheet-7.4.8 → tksheet-7.4.9}/tksheet/main_table.py

@@ -4349,7 +4349,7 @@ class MainTable(tk.Canvas):
             return self.data
 
     def get_cell_dimensions(self, datarn: int, datacn: int) -> tuple[int, int]:
-        txt = self.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True)
+        txt = self.cell_str(datarn, datacn, get_displayed=True)
         if txt:
             self.txt_measure_canvas.itemconfig(self.txt_measure_canvas_text, text=txt, font=self.PAR.ops.table_font)
             b = self.txt_measure_canvas.bbox(self.txt_measure_canvas_text)
@@ -4478,7 +4478,7 @@ class MainTable(tk.Canvas):
             sum(
                 1
                 for _ in wrap_text(
-                    text=self.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True),
+                    text=self.cell_str(datarn, datacn, get_displayed=True),
                     max_width=self.get_cell_max_width(datarn, dispcn),
                     max_lines=float("inf"),
                     char_width_fn=self.wrap_get_char_w,
@@ -4524,7 +4524,7 @@ class MainTable(tk.Canvas):
             w = min_column_width if width is None else width
             w = hw if (hw := self.CH.get_cell_dimensions(datacn)[0]) > w else min_column_width
             for datarn in iterrows:
-                if txt := self.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True):
+                if txt := self.cell_str(datarn, datacn, get_displayed=True):
                     qconf(qtxtm, text=txt, font=qfont)
                     b = qbbox(qtxtm)
                     tw = b[2] - b[0] + added_w_space
@@ -6240,7 +6240,7 @@ class MainTable(tk.Canvas):
                     cells["dropdown"][(datarn, datacn)] = kwargs
                 elif kwargs := self.get_cell_kwargs(datarn, datacn, key="checkbox"):
                     cells["checkbox"][(datarn, datacn)] = kwargs
-                cells[(datarn, datacn)] = self.get_valid_cell_data_as_str(datarn, datacn, get_displayed=True)
+                cells[(datarn, datacn)] = self.cell_str(datarn, datacn, get_displayed=True)
         return cells
 
     def wrap_get_char_w(self, c: str) -> int:
@@ -8075,31 +8075,30 @@ class MainTable(tk.Canvas):
                 for datarn in range(len(self.data)):
                     self.set_cell_data(datarn, datacn, get_val(datarn, datacn), expand_sheet=False)
 
-    # deals with possibility of formatter class being in self.data cell
-    # if cell is formatted - possibly returns invalid_value kwarg if
-    # cell value is not in datatypes kwarg
-    # if get displayed is true then Nones are replaced by ""
-    def get_valid_cell_data_as_str(self, datarn: int, datacn: int, get_displayed: bool = False, **kwargs) -> str:
+    def cell_str(self, datarn: int, datacn: int, get_displayed: bool = False, **kwargs) -> str:
+        """
+        deals with possibility of formatter class being in self.data cell
+        if cell is formatted - possibly returns invalid_value kwarg if
+        cell value is not in datatypes kwarg
+        if get displayed is true then Nones are replaced by
+        """
+        kwargs = self.get_cell_kwargs(datarn, datacn, key=None)
         if get_displayed:
-            kwargs = self.get_cell_kwargs(datarn, datacn, key="dropdown")
-            if kwargs:
-                if kwargs["text"] is not None:
-                    return f"{kwargs['text']}"
-            else:
-                kwargs = self.get_cell_kwargs(datarn, datacn, key="checkbox")
-                if kwargs:
-                    return f"{kwargs['text']}"
+            if kwargs and "dropdown" in kwargs:
+                if kwargs["dropdown"]["text"] is not None:
+                    return f"{kwargs['dropdown']['text']}"
+            elif kwargs and "checkbox" in kwargs:
+                return f"{kwargs['checkbox']['text']}"
         try:
             value = self.data[datarn][datacn]
         except Exception:
             value = ""
-        kwargs = self.get_cell_kwargs(datarn, datacn, key="format")
-        if kwargs:
-            if kwargs["formatter"] is None:
+        if "format" in kwargs:
+            if kwargs["format"]["formatter"] is None:
                 if get_displayed:
-                    return data_to_str(value, **kwargs)
+                    return data_to_str(value, **kwargs["format"])
                 else:
-                    return f"{get_data_with_valid_check(value, **kwargs)}"
+                    return f"{get_data_with_valid_check(value, **kwargs['format'])}"
             else:
                 if get_displayed:
                     # assumed given formatter class has __str__()
@@ -8114,9 +8113,15 @@ class MainTable(tk.Canvas):
         self,
         datarn: int,
         datacn: int,
+        get_displayed: bool = False,
         none_to_empty_str: bool = False,
         fmt_kw: dict | None = None,
     ) -> Any:
+        if get_displayed:
+            if fmt_kw:
+                return format_data(value=self.cell_str(datarn, datacn, get_displayed=True), **fmt_kw)
+            else:
+                return self.cell_str(datarn, datacn, get_displayed=True)
         try:  # when successful try is more than twice as fast as len check
             value = self.data[datarn][datacn]
         except Exception:

{tksheet-7.4.8 → tksheet-7.4.9}/tksheet/row_index.py

@@ -1100,7 +1100,7 @@ class RowIndex(tk.Canvas):
             self.itemconfig(item, state="hidden")
 
     def get_cell_dimensions(self, datarn: int) -> tuple[int, int]:
-        txt = self.get_valid_cell_data_as_str(datarn, fix=False)
+        txt = self.cell_str(datarn, fix=False)
         if txt:
             self.MT.txt_measure_canvas.itemconfig(self.MT.txt_measure_canvas_text, text=txt, font=self.ops.index_font)
             b = self.MT.txt_measure_canvas.bbox(self.MT.txt_measure_canvas_text)
@@ -1127,7 +1127,7 @@ class RowIndex(tk.Canvas):
             sum(
                 1
                 for _ in wrap_text(
-                    text=self.get_valid_cell_data_as_str(datarn, fix=False),
+                    text=self.cell_str(datarn, fix=False),
                     max_width=self.current_width,
                     max_lines=float("inf"),
                     char_width_fn=self.wrap_get_char_w,
@@ -1776,7 +1776,7 @@ class RowIndex(tk.Canvas):
                 )
             if max_width <= 1:
                 continue
-            text = self.get_valid_cell_data_as_str(datarn, fix=False)
+            text = self.cell_str(datarn, fix=False)
             if not text:
                 continue
             start_line = max(0, int((scrollpos_top - rtopgridln) / self.MT.index_txt_height))
@@ -2457,7 +2457,7 @@ class RowIndex(tk.Canvas):
         redirect_int: bool = False,
     ) -> Any:
         if get_displayed:
-            return self.get_valid_cell_data_as_str(datarn, fix=False)
+            return self.cell_str(datarn, fix=False)
         if redirect_int and isinstance(self.MT._row_index, int):  # internal use
             return self.MT.get_cell_data(datarn, self.MT._row_index, none_to_empty_str=True)
         if (
@@ -2471,7 +2471,7 @@ class RowIndex(tk.Canvas):
             return self.MT._row_index[datarn].text
         return self.MT._row_index[datarn]
 
-    def get_valid_cell_data_as_str(self, datarn: int, fix: bool = True) -> str:
+    def cell_str(self, datarn: int, fix: bool = True) -> str:
         kwargs = self.get_cell_kwargs(datarn, key="dropdown")
         if kwargs:
             if kwargs["text"] is not None:
@@ -2481,7 +2481,7 @@ class RowIndex(tk.Canvas):
             if kwargs:
                 return f"{kwargs['text']}"
         if isinstance(self.MT._row_index, int):
-            return self.MT.get_valid_cell_data_as_str(datarn, self.MT._row_index, get_displayed=True)
+            return self.MT.cell_str(datarn, self.MT._row_index, get_displayed=True)
         if fix:
             self.fix_index(datarn)
         try:

{tksheet-7.4.8 → tksheet-7.4.9}/tksheet/sheet.py

@@ -1048,7 +1048,7 @@ class Sheet(tk.Frame):
     def get_data(self, *key: CreateSpanTypes) -> Any:
         """
         e.g. retrieves entire table as pandas dataframe
-        sheet["A1"].expand().options(pandas.DataFrame).data
+        sheet["A1"].expand().options(convert=pandas.DataFrame).data
 
         must deal with
         - format
@@ -1107,56 +1107,48 @@ class Sheet(tk.Frame):
         """
         span = self.span_from_key(*key)
         rows, cols = self.ranges_from_span(span)
-        tdisp, idisp, hdisp = span.tdisp, span.idisp, span.hdisp
         table, index, header = span.table, span.index, span.header
         fmt_kw = span.kwargs if span.type_ == "format" and span.kwargs else None
-        quick_tdata, quick_idata, quick_hdata = self.MT.get_cell_data, self.RI.get_cell_data, self.CH.get_cell_data
+        t_data = partial(self.MT.get_cell_data, get_displayed=True) if span.tdisp else self.MT.get_cell_data
+        i_data = self.RI.cell_str if span.idisp else self.RI.get_cell_data
+        h_data = self.CH.cell_str if span.hdisp else self.CH.get_cell_data
         res = []
         if span.transposed:
+            # Index row (first row when transposed)
             if index:
-                if index and header:
-                    if table:
-                        res.append([""] + [quick_idata(r, get_displayed=idisp) for r in rows])
-                    else:
-                        res.append([quick_idata(r, get_displayed=idisp) for r in rows])
-                else:
-                    res.append([quick_idata(r, get_displayed=idisp) for r in rows])
+                index_row = [""] if header and table else []
+                index_row.extend(i_data(r) for r in rows)
+                res.append(index_row)
+            # Header and/or table data as columns
             if header:
-                if table:
-                    res.extend(
-                        [quick_hdata(c, get_displayed=hdisp)]
-                        + [quick_tdata(r, c, get_displayed=tdisp, fmt_kw=fmt_kw) for r in rows]
-                        for c in cols
-                    )
-                else:
-                    res.extend([quick_hdata(c, get_displayed=hdisp)] for c in cols)
+                for c in cols:
+                    col = [h_data(c)]
+                    if table:
+                        col.extend(t_data(r, c, fmt_kw=fmt_kw) for r in rows)
+                    res.append(col)
             elif table:
-                res.extend([quick_tdata(r, c, get_displayed=tdisp, fmt_kw=fmt_kw) for r in rows] for c in cols)
-        elif not span.transposed:
+                res.extend([t_data(r, c, fmt_kw=fmt_kw) for r in rows] for c in cols)
+        else:
+            # Header row
             if header:
-                if header and index:
-                    if table:
-                        res.append([""] + [quick_hdata(c, get_displayed=hdisp) for c in cols])
-                    else:
-                        res.append([quick_hdata(c, get_displayed=hdisp) for c in cols])
-                else:
-                    res.append([quick_hdata(c, get_displayed=hdisp) for c in cols])
+                header_row = [""] if index and table else []
+                header_row.extend(h_data(c) for c in cols)
+                res.append(header_row)
+            # Index and/or table data as rows
             if index:
-                if table:
-                    res.extend(
-                        [quick_idata(r, get_displayed=idisp)]
-                        + [quick_tdata(r, c, get_displayed=tdisp, fmt_kw=fmt_kw) for c in cols]
-                        for r in rows
-                    )
-                else:
-                    res.extend([quick_idata(r, get_displayed=idisp)] for r in rows)
+                for r in rows:
+                    row = [i_data(r)]
+                    if table:
+                        row.extend(t_data(r, c, fmt_kw=fmt_kw) for c in cols)
+                    res.append(row)
             elif table:
-                res.extend([quick_tdata(r, c, get_displayed=tdisp, fmt_kw=fmt_kw) for c in cols] for r in rows)
+                res.extend([t_data(r, c, fmt_kw=fmt_kw) for c in cols] for r in rows)
+
         if not span.ndim:
             # it's a cell
             if len(res) == 1 and len(res[0]) == 1:
                 res = res[0][0]
-            # it's a single list
+            # it's a single sublist
             elif len(res) == 1:
                 res = res[0]
             # retrieving a list of index cells or
@@ -1168,11 +1160,12 @@ class Sheet(tk.Frame):
         elif span.ndim == 1:
             # flatten sublists
             res = res[0] if len(res) == 1 and len(res[0]) == 1 else list(chain.from_iterable(res))
-        # if span.ndim == 2 res keeps its current
-        # dimensions as a list of lists
-        if span.convert is not None:
+        # if span.ndim == 2 res keeps its current dimensions as a list of lists
+
+        if span.convert is None:
+            return res
+        else:
             return span.convert(res)
-        return res
 
     def get_total_rows(self, include_index: bool = False) -> int:
         return self.MT.total_data_rows(include_index=include_index)
@@ -2533,13 +2526,13 @@ class Sheet(tk.Frame):
                 self.del_index_cell_options_dropdown_and_checkbox(r)
                 add_to_options(self.RI.cell_options, r, "checkbox", d)
                 if edit_data:
-                    set_idata(r, checked if isinstance(checked, bool) else force_bool(self.get_index_data(r)))
+                    set_idata(r, checked if isinstance(checked, bool) else force_bool(self.RI.get_cell_data(r)))
         if header:
             for c in cols:
                 self.del_header_cell_options_dropdown_and_checkbox(c)
                 add_to_options(self.CH.cell_options, c, "checkbox", d)
                 if edit_data:
-                    set_hdata(c, checked if isinstance(checked, bool) else force_bool(self.get_header_data(c)))
+                    set_hdata(c, checked if isinstance(checked, bool) else force_bool(self.CH.get_cell_data(c)))
         if table:
             if span.kind == "cell":
                 for r in rows:
@@ -5304,7 +5297,7 @@ class Sheet(tk.Frame):
 
     def get_cell_data(self, r: int, c: int, get_displayed: bool = False) -> Any:
         if get_displayed:
-            return self.MT.get_valid_cell_data_as_str(r, c, get_displayed=True)
+            return self.MT.cell_str(r, c, get_displayed=True)
         else:
             return self.MT.get_cell_data(r, c)
 
@@ -5323,15 +5316,16 @@ class Sheet(tk.Frame):
                 raise ValueError(tksheet_type_error("only_columns", ["int", "iterable", "None"], only_columns))
         if r >= self.MT.total_data_rows():
             raise IndexError(f"Row #{r} is out of range.")
+
         if r >= len(self.MT.data):
             total_data_cols = self.MT.total_data_cols()
             self.MT.fix_data_len(r, total_data_cols - 1)
+
         iterable = only_columns if only_columns is not None else range(len(self.MT.data[r]))
-        f = partial(self.MT.get_valid_cell_data_as_str, get_displayed=True) if get_displayed else self.MT.get_cell_data
-        if get_index:
-            return [self.get_index_data(r, get_displayed=get_index_displayed)] + [f(r, c) for c in iterable]
-        else:
-            return [f(r, c) for c in iterable]
+        f = partial(self.MT.cell_str, get_displayed=True) if get_displayed else self.MT.get_cell_data
+        row = [self.RI.get_cell_data(r, get_displayed=get_index_displayed)] if get_index else []
+        row.extend(f(r, c) for c in iterable)
+        return row
 
     def get_column_data(
         self,
@@ -5347,10 +5341,10 @@ class Sheet(tk.Frame):
             elif not is_iterable(only_rows):
                 raise ValueError(tksheet_type_error("only_rows", ["int", "iterable", "None"], only_rows))
         iterable = only_rows if only_rows is not None else range(len(self.MT.data))
-        f = partial(self.MT.get_valid_cell_data_as_str, get_displayed=True) if get_displayed else self.MT.get_cell_data
-        return ([self.get_header_data(c, get_displayed=get_header_displayed)] if get_header else []) + [
-            f(r, c) for r in iterable
-        ]
+        f = partial(self.MT.cell_str, get_displayed=True) if get_displayed else self.MT.get_cell_data
+        col = [self.CH.get_cell_data(c, get_displayed=get_header_displayed)] if get_header else []
+        col.extend(f(r, c) for r in iterable)
+        return col
 
     def get_sheet_data(
         self,
@@ -5361,7 +5355,7 @@ class Sheet(tk.Frame):
         get_index_displayed: bool = True,
         only_rows: AnyIter[int] | int | None = None,
         only_columns: AnyIter[int] | int | None = None,
-    ) -> list[Any]:
+    ) -> list[list[Any]]:
         if only_rows is not None:
             if isinstance(only_rows, int):
                 only_rows = (only_rows,)
@@ -5372,6 +5366,7 @@ class Sheet(tk.Frame):
                 only_columns = (only_columns,)
             elif not is_iterable(only_columns):
                 raise ValueError(tksheet_type_error("only_columns", ["int", "iterable", "None"], only_columns))
+
         if get_header:
             maxlen = len(self.MT._headers) if isinstance(self.MT._headers, (list, tuple)) else 0
             data = []
@@ -5380,15 +5375,19 @@ class Sheet(tk.Frame):
                 if len(r) > maxlen:
                     maxlen = len(r)
                 if get_index:
-                    data.append([self.get_index_data(rn, get_displayed=get_index_displayed)] + r)
+                    row = [self.RI.get_cell_data(rn, get_displayed=get_index_displayed)]
+                    row.extend(r)
+                    data.append(row)
                 else:
                     data.append(r)
             iterable = only_columns if only_columns is not None else range(maxlen)
-            if get_index:
-                return [[""] + [self.get_header_data(cn, get_displayed=get_header_displayed) for cn in iterable]] + data
-            else:
-                return [[self.get_header_data(cn, get_displayed=get_header_displayed) for cn in iterable]] + data
-        elif not get_header:
+            header_row = [""] if get_index else []
+            header_row.extend(self.CH.get_cell_data(cn, get_displayed=get_header_displayed) for cn in iterable)
+            result = [header_row]
+            result.extend(data)
+            return result
+
+        else:
             iterable = only_rows if only_rows is not None else range(len(self.MT.data))
             return [
                 self.get_row_data(
@@ -5410,7 +5409,7 @@ class Sheet(tk.Frame):
         get_header_displayed: bool = True,
         only_rows: int | AnyIter[int] | None = None,
         only_columns: int | AnyIter[int] | None = None,
-    ) -> Iterator[list[Any]]:
+    ) -> Generator[list[Any]]:
         if only_rows is not None:
             if isinstance(only_rows, int):
                 only_rows = (only_rows,)
@@ -5421,11 +5420,13 @@ class Sheet(tk.Frame):
                 only_columns = (only_columns,)
             elif not is_iterable(only_columns):
                 raise ValueError(tksheet_type_error("only_columns", ["int", "iterable", "None"], only_columns))
+
         if get_header:
             iterable = only_columns if only_columns is not None else range(self.MT.total_data_cols())
-            yield ([""] if get_index else []) + [
-                self.get_header_data(c, get_displayed=get_header_displayed) for c in iterable
-            ]
+            header_row = [""] if get_index else []
+            header_row.extend(self.CH.get_cell_data(c, get_displayed=get_header_displayed) for c in iterable)
+            yield header_row
+
         iterable = only_rows if only_rows is not None else range(len(self.MT.data))
         yield from (
             self.get_row_data(

{tksheet-7.4.8 → tksheet-7.4.9/tksheet.egg-info}/PKG-INFO

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