execsql2 2.0.0a2__py3-none-any.whl → 2.1.1__py3-none-any.whl

execsql/metacommands/script_ext.py

@@ -13,15 +13,17 @@ Implements metacommands that extend or augment a running script:
 from typing import Any
 
 import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.script import MetacommandStmt, ScriptCmd, ScriptExecSpec, SqlStmt, current_script_line
 
 
 def x_extendscript(**kwargs: Any) -> None:
     script1 = kwargs["script1"].lower()
     if script1 not in _state.savedscripts:
-        raise _state.ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script1}.")
+        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script1}.")
     script2 = kwargs["script2"].lower()
     if script2 not in _state.savedscripts:
-        raise _state.ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script2}.")
+        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script2}.")
     s1 = _state.savedscripts[script1]
     s2 = _state.savedscripts[script2]
     for cmd in s1.cmdlist:
@@ -37,20 +39,20 @@ def x_extendscript(**kwargs: Any) -> None:
 def x_extendscript_metacommand(**kwargs: Any) -> None:
     script = kwargs["script"].lower()
     if script not in _state.savedscripts:
-        raise _state.ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script}.")
-    script_file, script_line_no = _state.current_script_line()
+        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script}.")
+    script_file, script_line_no = current_script_line()
     _state.savedscripts[script].add(
-        _state.ScriptCmd(script_file, script_line_no, "cmd", _state.MetacommandStmt(kwargs["cmd"])),
+        ScriptCmd(script_file, script_line_no, "cmd", MetacommandStmt(kwargs["cmd"])),
     )
 
 
 def x_extendscript_sql(**kwargs: Any) -> None:
     script = kwargs["script"].lower()
     if script not in _state.savedscripts:
-        raise _state.ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script}.")
-    script_file, script_line_no = _state.current_script_line()
+        raise ErrInfo("cmd", other_msg=f"There is no SCRIPT named {script}.")
+    script_file, script_line_no = current_script_line()
     _state.savedscripts[script].add(
-        _state.ScriptCmd(script_file, script_line_no, "sql", _state.SqlStmt(kwargs["sql"])),
+        ScriptCmd(script_file, script_line_no, "sql", SqlStmt(kwargs["sql"])),
     )
 
 
@@ -58,4 +60,4 @@ def x_executescript(**kwargs: Any) -> None:
     exists = kwargs["exists"]
     script_id = kwargs["script_id"].lower()
     if exists is None or (exists is not None and script_id in _state.savedscripts):
-        _state.ScriptExecSpec(**kwargs).execute()
+        ScriptExecSpec(**kwargs).execute()

execsql/metacommands/system.py

@@ -14,20 +14,39 @@ import subprocess
 from typing import Any
 
 import execsql.state as _state
+from execsql.exceptions import ErrInfo
+from execsql.exporters.base import WriteSpec
+from execsql.script import ScriptExecSpec, current_script_line
+from execsql.utils.errors import exception_desc
+from execsql.utils.fileio import filewriter_close_all_after_write
+from execsql.utils.gui import (
+    gui_console_height,
+    gui_console_hide,
+    gui_console_off,
+    gui_console_on,
+    gui_console_progress,
+    gui_console_save,
+    gui_console_show,
+    gui_console_status,
+    gui_console_wait_user,
+    gui_console_width,
+)
+from execsql.utils.mail import MailSpec, Mailer
+from execsql.utils.strings import is_doublequoted
 
 
 def x_system_cmd(**kwargs: Any) -> None:
     syscmd = kwargs["command"]
     cont = kwargs["continue"]
-    script, lno = _state.current_script_line()
+    script, lno = current_script_line()
     _state.exec_log.log_user_msg(f"System command on line {lno} of script {script}: {syscmd}")
-    _state.filewriter_close_all_after_write()
+    filewriter_close_all_after_write()
     if os.name != "posix":
         syscmd = syscmd.replace("\\", "\\\\")
         cmdlist = shlex.split(syscmd)
     else:
         cmdlist = shlex.split(syscmd, posix=True)
-    cmdargs = ['"' + cmd + '"' if "&" in cmd and not _state.is_doublequoted(cmd) else cmd for cmd in cmdlist]
+    cmdargs = ['"' + cmd + '"' if "&" in cmd and not is_doublequoted(cmd) else cmd for cmd in cmdlist]
     if cont is None:
         returncode = subprocess.call(cmdargs)
         _state.subvars.add_substitution("$SYSTEM_CMD_EXIT_STATUS", str(returncode))
@@ -43,7 +62,7 @@ def x_email(**kwargs: Any) -> None:
     msg = kwargs["msg"]
     msg_file = kwargs["msg_file"]
     att_file = kwargs["att_file"]
-    m = _state.Mailer()
+    m = Mailer()
     m.sendmail(from_addr, to_addr, subject, msg, msg_file, att_file)
 
 
@@ -73,9 +92,9 @@ def x_log_datavars(**kwargs: Any) -> None:
 def x_console(**kwargs: Any) -> None:
     onoff = kwargs["onoff"].lower()
     if onoff == "on":
-        _state.gui_console_on()
+        gui_console_on()
     else:
-        _state.gui_console_off()
+        gui_console_off()
 
 
 def x_consoleprogress(**kwargs: Any) -> None:
@@ -83,12 +102,12 @@ def x_consoleprogress(**kwargs: Any) -> None:
     total = kwargs["total"]
     if total:
         num = 100 * num / float(total)
-    _state.gui_console_progress(num)
+    gui_console_progress(num)
 
 
 def x_consolewait(**kwargs: Any) -> None:
     message = kwargs["message"]
-    _state.gui_console_wait_user(message)
+    gui_console_wait_user(message)
 
 
 def x_consolewait_onerror(**kwargs: Any) -> None:
@@ -104,39 +123,39 @@ def x_consolewait_whendone(**kwargs: Any) -> None:
 def x_console_hideshow(**kwargs: Any) -> None:
     hideshow = kwargs["hideshow"].lower()
     if hideshow == "hide":
-        _state.gui_console_hide()
+        gui_console_hide()
     else:
-        _state.gui_console_show()
+        gui_console_show()
 
 
 def x_consolewidth(**kwargs: Any) -> None:
     width = kwargs["width"]
     _state.conf.gui_console_width = int(width)
-    _state.gui_console_width(width)
+    gui_console_width(width)
 
 
 def x_consoleheight(**kwargs: Any) -> None:
     height = kwargs["height"]
     _state.conf.gui_console_height = int(height)
-    _state.gui_console_height(height)
+    gui_console_height(height)
 
 
 def x_consolestatus(**kwargs: Any) -> None:
     message = kwargs["message"]
-    _state.gui_console_status(message)
+    gui_console_status(message)
 
 
 def x_consolesave(**kwargs: Any) -> None:
     fn = kwargs["filename"]
     ap = kwargs["append"]
     append = ap is not None
-    _state.gui_console_save(fn, append)
+    gui_console_save(fn, append)
 
 
 def x_cancel_halt(**kwargs: Any) -> None:
     flag = kwargs["onoff"].lower()
     if flag not in ("on", "off", "yes", "no", "true", "false"):
-        raise _state.ErrInfo(
+        raise ErrInfo(
             type="cmd",
             command_text=kwargs["metacommandline"],
             other_msg=f"Unrecognized flag for handling GUI cancellations: {flag}",
@@ -152,9 +171,9 @@ def x_cancel_halt_write_clear(**kwargs: Any) -> None:
 def x_cancel_halt_write(**kwargs: Any) -> None:
     msg = f"{kwargs['text']}\n"
     tee = kwargs["tee"]
-    tee = False if not tee else True
+    tee = bool(tee)
     outf = kwargs["filename"]
-    _state.cancel_halt_writespec = _state.WriteSpec(message=msg, dest=outf, tee=tee)
+    _state.cancel_halt_writespec = WriteSpec(message=msg, dest=outf, tee=tee)
 
 
 def x_cancel_halt_email_clear(**kwargs: Any) -> None:
@@ -168,11 +187,11 @@ def x_cancel_halt_email(**kwargs: Any) -> None:
     msg = kwargs["msg"]
     msg_file = kwargs["msg_file"]
     att_file = kwargs["att_file"]
-    _state.cancel_halt_mailspec = _state.MailSpec(from_addr, to_addr, subject, msg, msg_file, att_file)
+    _state.cancel_halt_mailspec = MailSpec(from_addr, to_addr, subject, msg, msg_file, att_file)
 
 
 def x_cancel_halt_exec(**kwargs: Any) -> None:
-    _state.cancel_halt_exec = _state.ScriptExecSpec(**kwargs)
+    _state.cancel_halt_exec = ScriptExecSpec(**kwargs)
 
 
 def x_cancel_halt_exec_clear(**kwargs: Any) -> None:
@@ -186,9 +205,9 @@ def x_error_halt_write_clear(**kwargs: Any) -> None:
 def x_error_halt_write(**kwargs: Any) -> None:
     msg = f"{kwargs['text']}\n"
     tee = kwargs["tee"]
-    tee = False if not tee else True
+    tee = bool(tee)
     outf = kwargs["filename"]
-    _state.err_halt_writespec = _state.WriteSpec(message=msg, dest=outf, tee=tee)
+    _state.err_halt_writespec = WriteSpec(message=msg, dest=outf, tee=tee)
 
 
 def x_error_halt_email_clear(**kwargs: Any) -> None:
@@ -202,11 +221,11 @@ def x_error_halt_email(**kwargs: Any) -> None:
     msg = kwargs["msg"]
     msg_file = kwargs["msg_file"]
     att_file = kwargs["att_file"]
-    _state.err_halt_email = _state.MailSpec(from_addr, to_addr, subject, msg, msg_file, att_file)
+    _state.err_halt_email = MailSpec(from_addr, to_addr, subject, msg, msg_file, att_file)
 
 
 def x_error_halt_exec(**kwargs: Any) -> None:
-    _state.err_halt_exec = _state.ScriptExecSpec(**kwargs)
+    _state.err_halt_exec = ScriptExecSpec(**kwargs)
 
 
 def x_error_halt_exec_clear(**kwargs: Any) -> None:
@@ -230,8 +249,8 @@ def x_execute(**kwargs: Any) -> None:
     try:
         db.exec_cmd(sql)
         db.commit()
-    except _state.ErrInfo:
+    except ErrInfo:
         raise
     except Exception:
-        raise _state.ErrInfo("db", command_text=sql, exception_msg=_state.exception_desc())
+        raise ErrInfo("db", command_text=sql, exception_msg=exception_desc())
     return None

execsql/models.py

@@ -18,9 +18,8 @@ This module provides:
   ``"string"``, etc.).
 """
 
-import copy
 import re
-from typing import Any, List, Optional
+from typing import Any
 
 from execsql.exceptions import ColumnError, DataTableError
 from execsql.types import (
@@ -60,15 +59,9 @@ class Column:
             self.varscale = False
 
         def __repr__(self) -> str:
-            return "Data type %s; failed=%s; count=%d; maxlen=%d; varlen=%s, precision=%s, scale=%s, varscale=%s" % (
-                self.dt.data_type_name,
-                self.failed,
-                self.count,
-                self.maxlen,
-                self.varlen,
-                self.maxprecision,
-                self.scale,
-                self.varscale,
+            return (
+                f"Data type {self.dt.data_type_name}; failed={self.failed}; count={self.count}; maxlen={self.maxlen};"
+                f" varlen={self.varlen}, precision={self.maxprecision}, scale={self.scale}, varscale={self.varscale}"
             )
 
         def check(self, datavalue: Any) -> None:
@@ -160,7 +153,7 @@ class Column:
             if conf.trim_strings:
                 column_value = column_value.strip()
             if conf.replace_newlines:
-                column_value = re.sub(r"\s\t]*[\r\n]+[\s\t]*", " ", column_value)
+                column_value = re.sub(r"[\s\t]*[\r\n]+[\s\t]*", " ", column_value)
         if column_value is None or (
             not conf.empty_strings and isinstance(column_value, str) and len(column_value.strip()) == 0
         ):
@@ -202,7 +195,7 @@ class Column:
         self.dt = (
             self.name,
             sel_type.dt.__class__,
-            None if not sel_type.dt.lenspec else ac.maxlen,
+            None if not sel_type.dt.lenspec else sel_type.maxlen,
             self.nullrows > 0,
             sel_type.maxprecision,
             sel_type.scale,
@@ -212,7 +205,7 @@ class Column:
 
 
 class DataTable:
-    def __init__(self, column_names: List[str], rowsource: Any) -> None:
+    def __init__(self, column_names: list[str], rowsource: Any) -> None:
         import execsql.state as _state
 
         self.inputrows = 0  # Total number of rows in the row source.
@@ -263,7 +256,7 @@ class DataTable:
     def __repr__(self) -> str:
         return f"DataTable({[col.name for col in self.cols]!r}, rowsource)"
 
-    def column_declarations(self, database_type: DbType) -> List[str]:
+    def column_declarations(self, database_type: DbType) -> list[str]:
         # Returns a list of column specifications.
         spec = []
         for col in self.cols:
@@ -273,7 +266,7 @@ class DataTable:
     def create_table(
         self,
         database_type: DbType,
-        schemaname: Optional[str],
+        schemaname: str | None,
         tablename: str,
         pretty: bool = False,
     ) -> str:

execsql/parser.py

@@ -23,7 +23,7 @@ Classes:
 """
 
 import re
-from typing import Any, List, Optional
+from typing import Any
 
 from execsql.exceptions import CondParserError, NumericParserError
 
@@ -42,7 +42,7 @@ class SourceString:
         while not self.eoi() and self.str[self.currpos] in [" ", "\t", "\n"]:
             self.currpos += 1
 
-    def match_str(self, str: str) -> Optional[str]:
+    def match_str(self, str: str) -> str | None:
         # Tries to match the 'str' argument at the current position in the
         # source string.  Matching is case-insensitive.  If matching succeeds,
         # the matched string is returned and the internal pointer is incremented.
@@ -59,7 +59,7 @@ class SourceString:
             else:
                 return None
 
-    def match_regex(self, regex: Any) -> Optional[dict]:
+    def match_regex(self, regex: Any) -> dict | None:
         # Tries to match the 'regex' argument at the current position in the
         # source string.  If it succeeds, a dictionary of all of the named
         # groups is returned, and the internal pointer is incremented.
@@ -74,7 +74,7 @@ class SourceString:
             else:
                 return None
 
-    def match_metacommand(self, commandlist: Any) -> Optional[tuple]:
+    def match_metacommand(self, commandlist: Any) -> tuple | None:
         # Tries to match text at the current position to any metacommand
         # in the specified commandlist.
         # If it succeeds, the return value is a tuple of the MetaCommand object
@@ -185,21 +185,21 @@ class CondParser(CondTokens):
         self.condexpr = condexpr
         self.cond_expr = SourceString(condexpr)
 
-    def match_not(self) -> Optional[int]:
+    def match_not(self) -> int | None:
         # Try to match 'NOT' operator. If not found, return None
         m1 = self.cond_expr.match_str("NOT")
         if m1 is not None:
             return self.NOT
         return None
 
-    def match_andop(self) -> Optional[int]:
+    def match_andop(self) -> int | None:
         # Try to match 'AND' operator. If not found, return None
         m1 = self.cond_expr.match_str("AND")
         if m1 is not None:
             return self.AND
         return None
 
-    def match_orop(self) -> Optional[int]:
+    def match_orop(self) -> int | None:
         # Try to match 'OR' operator. If not found, return None
         m1 = self.cond_expr.match_str("OR")
         if m1 is not None:
@@ -270,7 +270,7 @@ class NumericParser(NumTokens):
         self.rxint = re.compile(r"(?P<int_num>[+-]?[0-9]+)")
         self.rxfloat = re.compile(r"(?P<float_num>[+-]?(?:(?:[0-9]*\.[0-9]+)|(?:[0-9]+\.[0-9]*)))")
 
-    def match_number(self) -> Optional[Any]:
+    def match_number(self) -> Any | None:
         # Try to match a number in the source string.
         # Return it if matched, return None if unmatched.
         m1 = self.num_expr.match_regex(self.rxfloat)
@@ -282,7 +282,7 @@ class NumericParser(NumTokens):
                 return int(m2["int_num"])
         return None
 
-    def match_mulop(self) -> Optional[int]:
+    def match_mulop(self) -> int | None:
         # Try to match a multiplication or division operator in the source string.
         # if found, return the matching operator type.  If not found, return None.
         m1 = self.num_expr.match_str("*")
@@ -294,7 +294,7 @@ class NumericParser(NumTokens):
                 return self.DIV
         return None
 
-    def match_addop(self) -> Optional[int]:
+    def match_addop(self) -> int | None:
         # Try to match an addition or subtraction operator in the source string.
         # if found, return the matching operator type.  If not found, return None.
         m1 = self.num_expr.match_str("+")