API refactor

venv/lib/python3.12/site-packages/alembic/util/messaging.py

@@ -5,6 +5,7 @@ from contextlib import contextmanager
 import logging
 import sys
 import textwrap
+from typing import Iterator
 from typing import Optional
 from typing import TextIO
 from typing import Union
@@ -12,8 +13,6 @@ import warnings
 
 from sqlalchemy.engine import url
 
-from . import sqla_compat
-
 log = logging.getLogger(__name__)
 
 # disable "no handler found" errors
@@ -53,7 +52,9 @@ def write_outstream(
 
 
 @contextmanager
-def status(status_msg: str, newline: bool = False, quiet: bool = False):
+def status(
+    status_msg: str, newline: bool = False, quiet: bool = False
+) -> Iterator[None]:
     msg(status_msg + " ...", newline, flush=True, quiet=quiet)
     try:
         yield
@@ -66,21 +67,24 @@ def status(status_msg: str, newline: bool = False, quiet: bool = False):
             write_outstream(sys.stdout, "  done\n")
 
 
-def err(message: str, quiet: bool = False):
+def err(message: str, quiet: bool = False) -> None:
     log.error(message)
     msg(f"FAILED: {message}", quiet=quiet)
     sys.exit(-1)
 
 
 def obfuscate_url_pw(input_url: str) -> str:
-    u = url.make_url(input_url)
-    return sqla_compat.url_render_as_string(u, hide_password=True)
+    return url.make_url(input_url).render_as_string(hide_password=True)
 
 
 def warn(msg: str, stacklevel: int = 2) -> None:
     warnings.warn(msg, UserWarning, stacklevel=stacklevel)
 
 
+def warn_deprecated(msg: str, stacklevel: int = 2) -> None:
+    warnings.warn(msg, DeprecationWarning, stacklevel=stacklevel)
+
+
 def msg(
     msg: str, newline: bool = True, flush: bool = False, quiet: bool = False
 ) -> None:
@@ -92,11 +96,17 @@ def msg(
             write_outstream(sys.stdout, "\n")
     else:
         # left indent output lines
-        lines = textwrap.wrap(msg, TERMWIDTH)
+        indent = "  "
+        lines = textwrap.wrap(
+            msg,
+            TERMWIDTH,
+            initial_indent=indent,
+            subsequent_indent=indent,
+        )
         if len(lines) > 1:
             for line in lines[0:-1]:
-                write_outstream(sys.stdout, "  ", line, "\n")
-        write_outstream(sys.stdout, "  ", lines[-1], ("\n" if newline else ""))
+                write_outstream(sys.stdout, line, "\n")
+        write_outstream(sys.stdout, lines[-1], ("\n" if newline else ""))
     if flush:
         sys.stdout.flush()