Only read "my" configuration files once, rather than once per call to read_my_cnf_files

Author: fabzzap

changelog.md

@@ -1,3 +1,11 @@
+Upcoming (TBD)
+==============
+
+Internal
+--------
+* Only read "my" configuration files once, rather than once per call to read_my_cnf_files
+
+
 1.38.3 (2025/08/21)
 ==============
 

mycli/main.py

@@ -48,6 +48,7 @@
 from mycli.compat import WIN
 from mycli.completion_refresher import CompletionRefresher
 from mycli.config import get_mylogin_cnf_path, open_mylogin_cnf, read_config_files, str_to_bool, strip_matching_quotes, write_default_config
+from mycli.configobj import ConfigObj
 from mycli.key_bindings import mycli_bindings
 from mycli.lexer import MyCliLexer
 from mycli.packages import special
@@ -172,9 +173,6 @@ def __init__(
         self.logger = logging.getLogger(__name__)
         self.initialize_logging()
 
-        prompt_cnf = self.read_my_cnf_files(self.cnf_files, ["prompt"])["prompt"]
-        self.prompt_format = prompt or prompt_cnf or c["main"]["prompt"] or self.default_prompt
-        self.multiline_continuation_char = c["main"]["prompt_continuation"]
         keyword_casing = c["main"].get("keyword_casing", "auto")
 
         self.query_history: list[Query] = []
@@ -200,6 +198,10 @@ def __init__(
                 # There was an error reading the login path file.
                 print("Error: Unable to read login path file.")
 
+        self.my_cnf = read_config_files(self.cnf_files, list_values=False)
+        prompt_cnf = self.read_my_cnf(self.my_cnf, ["prompt"])["prompt"]
+        self.prompt_format = prompt or prompt_cnf or c["main"]["prompt"] or self.default_prompt
+        self.multiline_continuation_char = c["main"]["prompt_continuation"]
         self.prompt_app = None
 
     def register_special_commands(self) -> None:
@@ -339,14 +341,13 @@ def initialize_logging(self) -> None:
         root_logger.debug("Initializing mycli logging.")
         root_logger.debug("Log file %r.", log_file)
 
-    def read_my_cnf_files(self, files: list[str | TextIOWrapper], keys: list[str]) -> dict[str, Any]:
+    def read_my_cnf(self, cnf: ConfigObj, keys: list[str]) -> dict[str, Any]:
         """
-        Reads a list of config files and merges them. The last one will win.
-        :param files: list of files to read
+        Retrieves some keys from a configuration, applies transformations, returns a new configuration.
+        :param cnf: configuration to read
         :param keys: list of keys to retrieve
         :returns: tuple, with None for missing keys.
         """
-        cnf = read_config_files(files, list_values=False)
 
         sections = ["client", "mysqld"]
         key_transformations = {
@@ -433,7 +434,7 @@ def connect(
             "ssl-verify-server-cert": None,
         }
 
-        cnf = self.read_my_cnf_files(self.cnf_files, list(cnf.keys()))
+        cnf = self.read_my_cnf(self.my_cnf, list(cnf.keys()))
 
         # Fall back to config values only if user did not specify a value.
         database = database or cnf["database"]
@@ -1080,7 +1081,7 @@ def configure_pager(self) -> None:
         if not os.environ.get("LESS"):
             os.environ["LESS"] = "-RXF"
 
-        cnf = self.read_my_cnf_files(self.cnf_files, ["pager", "skip-pager"])
+        cnf = self.read_my_cnf(self.my_cnf, ["pager", "skip-pager"])
         cnf_pager = cnf["pager"] or self.config["main"]["pager"]
 
         # help Windows users who haven't edited the default myclirc