typehint some of main.py, with fixes elsewhere

 * typehint >80% of main.py
 * requiring additional hints and fixes in config.py, sqlexecute.py,
   packages/parseutils.py, and others
 * typehint unhinted portions of sqlexecute.py
 * remove @export decorator and import explicitly into "special"
 * recast some uninformative variable names
 * assert that a connection is available before using it
 * take more care with: ssl config, port, and ssh_port types/defaults
   before creating a connection
 * local_infile is a boolean, not a string
 * ensure get_password_from_file() returns a value
 * assert that a PromptSession is available before invoking methods on
   it
 * set a fallback col/row size in case a prompt session is not available
 * declare and type self.conn in SQLExecute much earlier
 * take more care to distinguish falsey values from Nones in SQLExecute
   connect()
 * improve defaults passed to pymysql.connect(), matching them to the
   pymysql docs
 * test that self.conn is not None rather than checking for a "conn"
   attribute, before invoking close()
 * remove Python 2.x-compat Unicode literals trick for click
 * better catch empty database names in change_db()
 * take more care for edge-case values of text in one_iteration()
 * don't return None for connection_id_to_kill
 * clarify overlapping "e" variables
 * don't use self.sqlexecute when sqlexecute is already available
 * is_dropping_database() takes a string, not a list
 * typehint unhinted function in packages/parseutils.py
 * update changelog

Author: rolandwalker

changelog.md

@@ -1,4 +1,12 @@
-Unreleased
+Upcoming Release (TBD)
+======================
+
+Internal
+--------
+* Continue typehinting the non-test codebase.
+
+
+1.37.1 (2025/07/28)
 ======================
 
 Internal
@@ -7,6 +15,7 @@ Internal
 * Align LICENSE with SPDX format.
 * Fix deprecated `license` specification format in `pyproject.toml`.
 
+
 1.37.0 (2025/07/28)
 ======================
 

mycli/clibuffer.py

@@ -1,13 +1,13 @@
-from typing import Callable
+from __future__ import annotations
 
 from prompt_toolkit.application import get_app
 from prompt_toolkit.enums import DEFAULT_BUFFER
-from prompt_toolkit.filters import Condition
+from prompt_toolkit.filters import Condition, Filter
 
 from mycli.packages.special import iocommands
 
 
-def cli_is_multiline(mycli) -> Callable:
+def cli_is_multiline(mycli) -> Filter:
     @Condition
     def cond():
         doc = get_app().layout.get_buffer_by_name(DEFAULT_BUFFER).document

mycli/config.py

@@ -8,7 +8,7 @@
 from os.path import exists
 import struct
 import sys
-from typing import IO, BinaryIO, Literal
+from typing import IO, BinaryIO, Literal, TextIO
 
 from configobj import ConfigObj, ConfigObjError
 import pyaes
@@ -25,7 +25,7 @@ def log(logger: logging.Logger, level: int, message: str) -> None:
     logger.log(level, message)
 
 
-def read_config_file(f: str | TextIOWrapper, list_values: bool = True) -> ConfigObj | None:
+def read_config_file(f: str | TextIO | TextIOWrapper, list_values: bool = True) -> ConfigObj | None:
     """Read a config file.
 
     *list_values* set to `True` is the default behavior of ConfigObj.
@@ -52,7 +52,7 @@ def read_config_file(f: str | TextIOWrapper, list_values: bool = True) -> Config
     return config
 
 
-def get_included_configs(config_file: str | TextIOWrapper) -> list[str]:
+def get_included_configs(config_file: str | TextIOWrapper) -> list[str | TextIOWrapper]:
     """Get a list of configuration files that are included into config_path
     with !includedir directive.
 
@@ -64,7 +64,7 @@ def get_included_configs(config_file: str | TextIOWrapper) -> list[str]:
     """
     if not isinstance(config_file, str) or not os.path.isfile(config_file):
         return []
-    included_configs = []
+    included_configs: list[str | TextIOWrapper] = []
 
     try:
         with open(config_file) as f:
@@ -80,7 +80,7 @@ def get_included_configs(config_file: str | TextIOWrapper) -> list[str]:
     return included_configs
 
 
-def read_config_files(files: list[str], list_values: bool = True) -> ConfigObj:
+def read_config_files(files: list[str | TextIOWrapper], list_values: bool = True) -> ConfigObj:
     """Read and merge a list of config files."""
 
     config = create_default_config(list_values=list_values)