execsql2 2.0.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

execsql/exporters/templates.py

@@ -5,14 +5,16 @@ Template-based report generation for execsql.
 
 Provides :class:`StrTemplateReport` (Python :class:`string.Template`
 substitution) and :func:`report_query`, which drives the
-``EXPORT … FORMAT str-template``, ``FORMAT jinja``, and
-``FORMAT airspeed`` metacommand variants.  Jinja2 and Airspeed template
-processors are loaded lazily when selected.
+``EXPORT … FORMAT str-template`` and ``FORMAT jinja`` metacommand
+variants.  The Jinja2 template processor is loaded lazily when selected.
 """
 
-from typing import Any, Optional
+from typing import Any
 
 import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.utils.errors import fatal_error
+from execsql.utils.fileio import filewriter_close
 
 
 class StrTemplateReport:
@@ -39,7 +41,7 @@ class StrTemplateReport:
         data_dict_rows: Any,
         output_dest: str,
         append: bool = False,
-        zipfile: Optional[str] = None,
+        zipfile: str | None = None,
     ) -> None:
         conf = _state.conf
         from execsql.utils.fileio import EncodedFile
@@ -49,7 +51,7 @@ class StrTemplateReport:
             ofile = _state.output
         else:
             if zipfile is None:
-                _state.filewriter_close(output_dest)
+                filewriter_close(output_dest)
                 if append:
                     ofile = EncodedFile(output_dest, conf.output_encoding).open("a")
                 else:
@@ -68,8 +70,8 @@ class JinjaTemplateReport:
         global jinja2
         try:
             import jinja2
-        except:
-            _state.fatal_error(
+        except ImportError:
+            fatal_error(
                 "The jinja2 library is required to produce reports with the Jinja2 templating system.   See http://jinja.pocoo.org/",
             )
         conf = _state.conf
@@ -89,7 +91,7 @@ class JinjaTemplateReport:
         data_dict_rows: Any,
         output_dest: str,
         append: bool = False,
-        zipfile: Optional[str] = None,
+        zipfile: str | None = None,
     ) -> None:
         conf = _state.conf
         from execsql.utils.fileio import EncodedFile
@@ -99,7 +101,7 @@ class JinjaTemplateReport:
             ofile = _state.output
         else:
             if zipfile is None:
-                _state.filewriter_close(output_dest)
+                filewriter_close(output_dest)
                 if append:
                     ofile = EncodedFile(output_dest, conf.output_encoding).open("a")
                 else:
@@ -109,66 +111,9 @@ class JinjaTemplateReport:
         try:
             ofile.write(self.template.render(headers=headers, datatable=data_dict_rows))
         except jinja2.TemplateSyntaxError as e:
-            raise _state.ErrInfo("error", other_msg=e.message + f" on template line {e.lineno}")
+            raise ErrInfo("error", other_msg=e.message + f" on template line {e.lineno}")
         except jinja2.TemplateError as e:
-            raise _state.ErrInfo("error", other_msg=f"Jinja2 template error ({e.message})")
-        except:
-            raise
-        if output_dest != "stdout":
-            ofile.close()
-
-
-class AirspeedTemplateReport:
-    # Exporting/reporting using the Airspeed templating library.
-    def __init__(self, template_file: str) -> None:
-        global airspeed
-        try:
-            import airspeed
-        except:
-            _state.fatal_error(
-                "The airspeed library is required to produce reports with the Airspeed templating system.   See https://github.com/purcell/airspeed",
-            )
-        conf = _state.conf
-        self.infname = template_file
-        from execsql.utils.fileio import EncodedFile
-
-        inf = EncodedFile(template_file, conf.script_encoding)
-        self.template = airspeed.Template(inf.open("r").read())
-
-    def __repr__(self) -> str:
-        return f"StrTemplateReport({self.infname})"
-
-    def write_report(
-        self,
-        headers: Any,
-        data_dict_rows: Any,
-        output_dest: str,
-        append: bool = False,
-        zipfile: Optional[str] = None,
-    ) -> None:
-        # airspeed requires an entire list to be passed, not just an iterable,
-        # so produce a list of dictionaries.  This may be too big for memory if
-        # the data set is very large.
-        conf = _state.conf
-        from execsql.utils.fileio import EncodedFile
-        from execsql.exporters.zip import ZipWriter
-
-        data = [d for d in data_dict_rows]
-        if output_dest == "stdout":
-            ofile = _state.output
-        else:
-            if zipfile is None:
-                _state.filewriter_close(output_dest)
-                if append:
-                    ofile = EncodedFile(output_dest, conf.output_encoding).open("a")
-                else:
-                    ofile = EncodedFile(output_dest, conf.output_encoding).open("w")
-            else:
-                ofile = ZipWriter(zipfile, output_dest, append)
-        try:
-            ofile.write(self.template.merge({"headers": headers, "datatable": data}))
-        except airspeed.TemplateExecutionError as e:
-            raise _state.ErrInfo("error", other_msg=e.msg)
+            raise ErrInfo("error", other_msg=f"Jinja2 template error ({e.message})")
         except:
             raise
         if output_dest != "stdout":
@@ -181,7 +126,7 @@ def report_query(
     outfile: str,
     template_file: str,
     append: bool = False,
-    zipfile: Optional[str] = None,
+    zipfile: str | None = None,
 ) -> None:
     # Write (export) a template-based report.
     conf = _state.conf
@@ -189,8 +134,6 @@ def report_query(
     headers, ddict = db.select_rowdict(select_stmt)
     if conf.template_processor == "jinja":
         t = JinjaTemplateReport(template_file)
-    elif conf.template_processor == "airspeed":
-        t = AirspeedTemplateReport(template_file)
     else:
         t = StrTemplateReport(template_file)
     t.write_report(headers, ddict, outfile, append, zipfile=zipfile)

execsql/exporters/values.py

@@ -8,28 +8,29 @@ set as a series of SQL ``INSERT INTO … VALUES (…)`` statements, suitable
 for loading data into a database from a plain SQL file.
 """
 
-import io
-import os
-from typing import Any, Optional, List
+from typing import Any
 
 import execsql.state as _state
 from execsql.exporters.zip import ZipWriter
+from execsql.exceptions import ErrInfo
+from execsql.utils.errors import exception_desc
+from execsql.utils.fileio import filewriter_close
 
 
 def export_values(
     outfile: str,
-    hdrs: List[str],
+    hdrs: list[str],
     rows: Any,
     append: bool = False,
-    desc: Optional[str] = None,
-    zipfile: Optional[str] = None,
+    desc: str | None = None,
+    zipfile: str | None = None,
 ) -> None:
     conf = _state.conf
     if outfile.lower() == "stdout":
         f = _state.output
     else:
         if zipfile is None:
-            _state.filewriter_close(outfile)
+            filewriter_close(outfile)
             from execsql.utils.fileio import EncodedFile
 
             ef = EncodedFile(outfile, conf.output_encoding)
@@ -64,13 +65,13 @@ def write_query_to_values(
     db: Any,
     outfile: str,
     append: bool = False,
-    desc: Optional[str] = None,
-    zipfile: Optional[str] = None,
+    desc: str | None = None,
+    zipfile: str | None = None,
 ) -> None:
     try:
         hdrs, rows = db.select_rowsource(select_stmt)
-    except _state.ErrInfo:
+    except ErrInfo:
         raise
-    except:
-        raise _state.ErrInfo("db", select_stmt, exception_msg=_state.exception_desc())
+    except Exception:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
     export_values(outfile, hdrs, rows, append, desc, zipfile=zipfile)

execsql/exporters/xls.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from execsql.types import DT_TimestampTZ
 
 """
 XLS and XLSX spreadsheet export for execsql.
@@ -9,12 +10,11 @@ EXPORT metacommand.  Requires the ``execsql2[excel]`` extras.
 """
 
 import datetime
-import os
-import re
-from typing import Any, Optional, List
+from pathlib import Path
+from typing import Any
 
-import execsql.state as _state
 from execsql.exceptions import XlsFileError, XlsxFileError
+from execsql.utils.errors import fatal_error
 
 
 class XlsFile:
@@ -32,19 +32,19 @@ class XlsFile:
         try:
             global xlrd
             import xlrd
-        except:
-            _state.fatal_error("The xlrd library is needed to read Excel (.xls) spreadsheets.")
+        except ImportError:
+            fatal_error("The xlrd library is needed to read Excel (.xls) spreadsheets.")
         self.filename = None
         self.encoding = None
         self.wbk = None
         self.datemode = 0
         self.errlog = self.XlsLog()
 
-    def open(self, filename: str, encoding: Optional[str] = None, read_only: bool = False) -> None:
+    def open(self, filename: str, encoding: str | None = None, read_only: bool = False) -> None:
         self.filename = filename
         self.encoding = encoding
         self.read_only = read_only
-        if os.path.isfile(filename):
+        if Path(filename).is_file():
             # The 'read_only' argument is not used, but is present for compatibility with XlsxFile.open().
             self.wbk = xlrd.open_workbook(filename, logfile=self.errlog, encoding_override=self.encoding)
             self.datemode = self.wbk.datemode
@@ -64,7 +64,7 @@ class XlsFile:
                 sheet_no = int(sheetname)
                 if sheet_no < 1:
                     sheet_no = None
-            except:
+            except (ValueError, TypeError):
                 sheet_no = None
         if sheet_no is None:
             sheet = self.wbk.sheet_by_name(sheetname)
@@ -73,10 +73,10 @@ class XlsFile:
             sheet = self.wbk.sheet_by_index(max(0, sheet_no - 1))
         return sheet
 
-    def sheet_data(self, sheetname: Any, junk_header_rows: int = 0) -> List:
+    def sheet_data(self, sheetname: Any, junk_header_rows: int = 0) -> list:
         try:
             sheet = self.sheet_named(sheetname)
-        except:
+        except Exception:
             raise XlsFileError(f"There is no Excel worksheet named {sheetname} in {self.filename}.")
 
         # Don't rely on sheet.ncols and sheet.nrows, because Excel will count columns
@@ -88,7 +88,7 @@ class XlsFile:
             if columns:
                 d = [cells[c] for c in range(columns)]
             else:
-                d = [cell for cell in cells]
+                d = list(cells)
             datarow = []
             for c in d:
                 if c.ctype == 0:
@@ -97,9 +97,9 @@ class XlsFile:
                 elif c.ctype == 1:
                     # This might be a timestamp with time zone that xlrd treats as a string.
                     try:
-                        dt = _state.DT_TimestampTZ()._from_data(c.value)
+                        dt = DT_TimestampTZ()._from_data(c.value)
                         datarow.append(dt)
-                    except:
+                    except Exception:
                         datarow.append(c.value)
                 elif c.ctype == 2:
                     # float, but maybe should be int
@@ -159,19 +159,19 @@ class XlsxFile:
         try:
             global openpyxl
             import openpyxl
-        except:
-            _state.fatal_error("The openpyxl library is needed to read Excel (.xlsx) spreadsheets.")
+        except ImportError:
+            fatal_error("The openpyxl library is needed to read Excel (.xlsx) spreadsheets.")
         self.filename = None
         self.encoding = None
         self.wbk = None
         self.read_only = False
         self.errlog = self.XlsxLog()
 
-    def open(self, filename: str, encoding: Optional[str] = None, read_only: bool = False) -> None:
+    def open(self, filename: str, encoding: str | None = None, read_only: bool = False) -> None:
         self.filename = filename
         self.encoding = encoding
         self.read_only = read_only
-        if os.path.isfile(filename):
+        if Path(filename).is_file():
             if read_only:
                 self.wbk = openpyxl.load_workbook(filename, read_only=True)
             else:
@@ -186,7 +186,7 @@ class XlsxFile:
             self.filename = None
             self.encoding = None
 
-    def sheetnames(self) -> List[str]:
+    def sheetnames(self) -> list[str]:
         return self.wbk.sheetnames
 
     def sheet_named(self, sheetname: Any) -> Any:
@@ -199,7 +199,7 @@ class XlsxFile:
                 sheet_no = int(sheetname)
                 if sheet_no < 1:
                     sheet_no = None
-            except:
+            except (ValueError, TypeError):
                 sheet_no = None
         if sheet_no is not None:
             # User-specified sheet numbers should be 1-based
@@ -208,10 +208,10 @@ class XlsxFile:
             sheet = self.wbk[sheetname]
         return sheet
 
-    def sheet_data(self, sheetname: Any, junk_header_rows: int = 0) -> List:
+    def sheet_data(self, sheetname: Any, junk_header_rows: int = 0) -> list:
         try:
             sheet = self.sheet_named(sheetname)
-        except:
+        except Exception:
             raise XlsxFileError(f"There is no Excel worksheet named {sheetname} in {self.filename}.")
         # Don't rely on sheet.max_column and sheet.max_row, because Excel will count columns
         # and rows that have ever been filled, even if they are now empty.  Base the column count
@@ -219,14 +219,14 @@ class XlsxFile:
         # a row is entirely empty.
         # Get the header row, skipping junk rows
         rowsrc = sheet.iter_rows(max_row=junk_header_rows + 1, values_only=True)
-        for hdr_row in rowsrc:
+        for _hdr_row in rowsrc:
             pass
         # Get the number of columns
         ncols = 0
-        for c in range(len(hdr_row)):
-            if not hdr_row[c]:
+        for c in range(len(_hdr_row)):
+            if not _hdr_row[c]:
                 break
-            ncols += 1
+            ncols += 1  # noqa: SIM113
         # Get all the data rows
         sheet_data = []
         rowsrc = sheet.iter_rows(min_row=junk_header_rows + 1, values_only=True)

execsql/exporters/xml.py

@@ -8,13 +8,13 @@ to a well-formed XML file with one element per row and column values as
 child elements or attributes.
 """
 
-import io
-import os
-import re
-from typing import Any, Optional, List
+from typing import Any
 
 import execsql.state as _state
 from execsql.exporters.zip import ZipWriter
+from execsql.exceptions import ErrInfo
+from execsql.utils.errors import exception_desc
+from execsql.utils.fileio import filewriter_close
 
 
 def write_query_to_xml(
@@ -23,18 +23,18 @@ def write_query_to_xml(
     db: Any,
     outfile: str,
     append: bool = False,
-    desc: Optional[str] = None,
-    zipfile: Optional[str] = None,
+    desc: str | None = None,
+    zipfile: str | None = None,
 ) -> None:
     conf = _state.conf
     try:
         hdrs, rows = db.select_rowsource(select_stmt)
-    except _state.ErrInfo:
+    except ErrInfo:
         raise
-    except:
-        raise _state.ErrInfo("db", select_stmt, exception_msg=_state.exception_desc())
+    except Exception:
+        raise ErrInfo("db", select_stmt, exception_msg=exception_desc())
     if zipfile is None:
-        _state.filewriter_close(outfile)
+        filewriter_close(outfile)
         from execsql.utils.fileio import EncodedFile
 
         ef = EncodedFile(outfile, conf.output_encoding)
@@ -50,10 +50,10 @@ def write_query_to_xml(
     if desc is not None:
         f.write(f"<!--{desc}-->\n")
     f.write(f"<{tablename}>\n")
-    uhdrs = [str(h) for h in hdrs]
+    str_hdrs = [str(h) for h in hdrs]
     for row in rows:
         f.write("  <row>\n")
-        for i, col in enumerate(hdrs):
+        for i, col in enumerate(str_hdrs):
             f.write(f"    <{col}>{row[i]}</{col}>\n")
         f.write("  </row>\n")
     f.write(f"</{tablename}>\n")

execsql/exporters/zip.py

@@ -9,12 +9,9 @@ higher-level interface used by the EXPORT metacommand when the output is
 directed into a ``.zip`` archive.
 """
 
-import io
-import os
 import sys
 import time
 import zipfile
-from typing import Optional
 
 import execsql.state as _state
 

execsql/gui/__init__.py

@@ -22,7 +22,7 @@ if TYPE_CHECKING:
     from execsql.gui.base import GuiBackend
 
 
-def get_backend(framework: str = "tkinter") -> "GuiBackend":
+def get_backend(framework: str = "tkinter") -> GuiBackend:
     """Return the best available backend for *framework*.
 
     Falls back gracefully if the preferred backend's dependencies are missing.
@@ -50,7 +50,7 @@ def get_backend(framework: str = "tkinter") -> "GuiBackend":
     return ConsoleBackend()
 
 
-def gui_manager_loop(q: "queue.Queue[Any]", backend: "GuiBackend") -> None:
+def gui_manager_loop(q: queue.Queue[Any], backend: GuiBackend) -> None:
     """GUI manager thread main loop.
 
     Reads ``GuiSpec`` objects from *q*, dispatches each to *backend*, and

execsql/gui/console.py

@@ -226,7 +226,6 @@ class ConsoleBackend(GuiBackend):
         message = args.get("message", "")
         headers = args.get("headers", [])
         rows = args.get("rows", [])
-        button_list = args.get("button_list", [("OK", 1), ("Cancel", 0)])
 
         print(f"\n=== {title} ===", file=sys.stderr)
         if message:

execsql/gui/desktop.py

@@ -10,7 +10,6 @@ Note: On macOS, Tkinter requires that dialogs run in the main thread.
 from __future__ import annotations
 
 import os
-import sys
 import threading
 import time
 from typing import Any
@@ -22,7 +21,7 @@ from execsql.gui.base import GuiBackend
 # ---------------------------------------------------------------------------
 try:
     import tkinter as tk
-    from tkinter import filedialog, font, scrolledtext, ttk
+    from tkinter import filedialog, scrolledtext, ttk
 except ImportError as _e:
     raise ImportError(
         "tkinter is not available on this Python installation.",
@@ -63,7 +62,7 @@ def _populate_treeview(tree: ttk.Treeview, headers: list, rows: list) -> None:
 
 def _add_buttons(frame: tk.Frame, button_list: list, callback) -> None:
     """Add buttons from button_list = [(label, value, key?), ...] to frame."""
-    for i, btn in enumerate(button_list):
+    for _i, btn in enumerate(button_list):
         label = btn[0]
         value = btn[1]
         b = tk.Button(frame, text=label, command=lambda v=value: callback(v), padx=8)
@@ -862,7 +861,7 @@ class ConsoleWindow:
             if _state.output is not None and _state.output.write_func is self.write:
                 _state.output.reset()
         except Exception:
-            pass
+            pass  # Best-effort output reset during console teardown.
 
     def write(self, text: str) -> None:
         if self._text and self._text.winfo_exists():
@@ -925,7 +924,7 @@ class TkinterBackend(GuiBackend):
             try:
                 self._root.destroy()
             except Exception:
-                pass
+                pass  # Tk root may already be destroyed.
             self._root = None
 
     def _root_or_raise(self) -> tk.Tk:
@@ -1079,7 +1078,7 @@ class _TkinterSyncQueue:
 
     import queue as _stdlib_queue
 
-    def __init__(self, backend: "TkinterBackend") -> None:
+    def __init__(self, backend: TkinterBackend) -> None:
         self._backend = backend
 
     # GUI types for which a None/cancelled result means the user wants to exit.
@@ -1115,7 +1114,7 @@ class _TkinterSyncQueue:
                 try:
                     self._backend._root.update()
                 except Exception:
-                    pass
+                    pass  # Tk event loop may be torn down.
         except Exception as exc:
             result = {"error": str(exc), "button": None}
         if result is not None and spec.gui_type in self._EXIT_ON_CANCEL and result.get("button") is None:

execsql/gui/tui.py

@@ -248,8 +248,7 @@ class DisplayScreen(_BaseDialog):
                     id="text_input",
                 )
             with Horizontal(id="buttons"):
-                for btn in _button_row(button_list):
-                    yield btn
+                yield from _button_row(button_list)
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         btn_id = event.button.id
@@ -410,8 +409,7 @@ class CompareScreen(_BaseDialog):
                     yield Label("Table 2")
                     yield _make_table_widget("table2", headers2, rows2)
             with Horizontal(id="buttons"):
-                for btn in _button_row(button_list):
-                    yield btn
+                yield from _button_row(button_list)
 
     def on_mount(self) -> None:
         keylist = [str(k) for k in self.args.get("keylist", [])]
@@ -515,8 +513,7 @@ class SelectRowsScreen(_BaseDialog):
                     yield Label("Destination")
                     yield _make_table_widget("dest_table", headers2, rows2)
             with Horizontal(id="buttons"):
-                for btn in _button_row(button_list):
-                    yield btn
+                yield from _button_row(button_list)
 
     def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
         if event.data_table.id == "source_table":
@@ -564,8 +561,7 @@ class SelectSubScreen(_BaseDialog):
             with ScrollableContainer():
                 yield _make_table_widget("sel_table", headers, rows)
             with Horizontal(id="buttons"):
-                for btn in _button_row(button_list):
-                    yield btn
+                yield from _button_row(button_list)
 
     def on_data_table_row_highlighted(self, event: DataTable.RowHighlighted) -> None:
         row_key = event.row_key
@@ -649,8 +645,7 @@ class MapScreen(_BaseDialog):
                 with ScrollableContainer():
                     yield _make_table_widget("map_table", headers, rows)
             with Horizontal(id="buttons"):
-                for btn in _button_row(button_list):
-                    yield btn
+                yield from _button_row(button_list)
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         btn_id = event.button.id
@@ -862,7 +857,6 @@ def _build_screen_map() -> dict:
         GUI_SAVEFILE,
         GUI_SELECTROWS,
         GUI_SELECTSUB,
-        QUERY_CONSOLE,
     )
 
     return {
@@ -1125,7 +1119,7 @@ class ConsoleApp(App):
         try:
             self.query_one("#console_log", RichLog).write(text)
         except Exception:
-            pass
+            pass  # Widget may not be mounted yet.
 
     def set_status(self, msg: str) -> None:
         """Thread-safe status bar update."""
@@ -1135,7 +1129,7 @@ class ConsoleApp(App):
         try:
             self.query_one("#status_bar", Label).update(msg)
         except Exception:
-            pass
+            pass  # Widget may not be mounted yet.
 
     def set_progress(self, pct: float) -> None:
         """Thread-safe progress bar update (0–100)."""
@@ -1145,7 +1139,7 @@ class ConsoleApp(App):
         try:
             self.query_one("#progress_bar", ProgressBar).progress = max(0.0, min(100.0, pct))
         except Exception:
-            pass
+            pass  # Widget may not be mounted yet.
 
     def action_request_quit(self) -> None:
         if self._script_thread and self._script_thread.is_alive():

execsql/importers/base.py

@@ -10,27 +10,26 @@ importer sub-modules.  Given a :class:`~execsql.models.DataTable` and a
 information inferred during scanning.
 """
 
-import os
-import re
-from typing import Any, List, Optional
+from typing import Any
 
 from execsql.exceptions import ErrInfo
 from execsql.db.base import Database
 import execsql.state as _state
+from execsql.types import dbt_firebird
 
 
 def import_data_table(
     db: Database,
-    schemaname: Optional[str],
+    schemaname: str | None,
     tablename: str,
     is_new: Any,
-    hdrs: List[str],
-    data: List[Any],
+    hdrs: list[str],
+    data: list[Any],
 ) -> None:
     from execsql.utils.errors import exception_info
 
     conf = _state.conf
-    if any([x is None or len(x.strip()) == 0 for x in hdrs]):
+    if any(x is None or len(x.strip()) == 0 for x in hdrs):
         if conf.del_empty_cols:
             blanks = [i for i in range(len(hdrs)) if hdrs[i] is None or len(hdrs[i].strip()) == 0]
             while len(blanks) > 0:
@@ -72,8 +71,6 @@ def import_data_table(
     get_ts.tablespec = None
 
     exec_log = _state.exec_log
-    dbt_firebird = _state.dbt_firebird
-
     if is_new:
         if is_new == 2:
             tblspec = db.schema_qualified_table_name(schemaname, tablename)