Address some PR comments

Author: Avasam

stubs/SQLAlchemy/@tests/stubtest_allowlist.txt

@@ -9,11 +9,6 @@ sqlalchemy.engine.base.Engine.logging_name  # initialized if not None
 sqlalchemy.sql.lambdas.PyWrapper.__clause_element__
 sqlalchemy.testing.util.non_refcount_gc_collect
 
-# wrong argument name in implementation ("self" instead of "cls")
-sqlalchemy.engine.URL.__new__
-sqlalchemy.engine.url.URL.__new__
-sqlalchemy.util.langhelpers._symbol.__new__
-
 # abstract fields not present at runtime
 sqlalchemy.engine.Transaction.connection
 sqlalchemy.engine.Transaction.is_active
@@ -62,3 +57,9 @@ sqlalchemy.sql.quoted_name.lower
 sqlalchemy.sql.quoted_name.upper
 sqlalchemy.orm.ColumnProperty.Comparator.__clause_element__
 sqlalchemy.orm.properties.ColumnProperty.Comparator.__clause_element__
+
+# Same error as in stdlib due to it being re-erported
+sqlalchemy.util.compat.StringIO.seek
+sqlalchemy.util.compat.StringIO.truncate
+sqlalchemy.util.StringIO.seek
+sqlalchemy.util.StringIO.truncate

stubs/SQLAlchemy/sqlalchemy/engine/url.pyi

@@ -19,6 +19,7 @@ class _URLTuple(NamedTuple):
 _Query: TypeAlias = Mapping[str, str | Sequence[str]] | Sequence[tuple[str, str | Sequence[str]]]
 
 class URL(_URLTuple):
+    def __new__(self: type[Self], *arg, **kw) -> Self | URL: ...
     @classmethod
     def create(
         cls,

stubs/SQLAlchemy/sqlalchemy/orm/collections.pyi

@@ -1,4 +1,4 @@
-from _typeshed import Incomplete
+from _typeshed import Incomplete, SupportsKeysAndGetItem
 from collections.abc import Iterable, Mapping
 from typing import Any, TypeVar, overload
 from typing_extensions import Literal, SupportsIndex
@@ -124,4 +124,7 @@ class MappedCollection(dict[_KT, _VT]):
     def setdefault(self, key: _KT, default: _T) -> _VT | _T: ...
     @overload
     def setdefault(self, key: _KT, default: None = None) -> _VT | None: ...
-    def update(self, __other: Mapping[_KT, _VT] = ..., **kw: _VT) -> None: ...  # type: ignore[override]
+    @overload
+    def update(self, __other: SupportsKeysAndGetItem[_KT, _VT] = ..., **kwargs: _VT) -> None: ...
+    @overload
+    def update(self, __other: Iterable[tuple[_KT, _VT]] = ..., **kwargs: _VT) -> None: ...

stubs/SQLAlchemy/sqlalchemy/orm/strategy_options.pyi

@@ -51,13 +51,7 @@ class _UnboundLoad(Load):
 # wich is callable with their original parameters.
 #
 # While both mypy and pyright's validation work, Pylance is unable to
-# show the parameters and return types.
-#
-# There is a workaround (define the method for Pylance, then reassign
-# an instance of loader_option to it for mypy, and add pyright+Flake8
-# suppressions), but it is too hacky and relies on some unsupported quirks.
-#
-# Asking Pylance to add support for these generic callables might be preferable.
+# show the parameters and return types without a hacky workaround.
 ###
 
 _F = TypeVar("_F", bound=Callable[..., loader_option[Any]])

stubs/SQLAlchemy/sqlalchemy/testing/config.pyi

@@ -26,7 +26,7 @@ class Config:
     is_async: Any
     def __init__(self, db, db_opts, options, file_config) -> None: ...
     @classmethod
-    def register(cls, db, db_opts, options, file_config): ...
+    def register(cls, db, db_opts, options, file_config) -> Config: ...
     @classmethod
     def set_as_current(cls, config, namespace) -> None: ...
     @classmethod

stubs/SQLAlchemy/sqlalchemy/testing/provision.pyi

@@ -22,13 +22,7 @@ def reap_dbs(idents_file) -> None: ...
 # wich is callable with their original parameters.
 #
 # While both mypy and pyright's validation work, Pylance is unable to
-# show the parameters and return types.
-#
-# There is a workaround (define the method for Pylance, then reassign
-# an instance of register to it for mypy, and add pyright+Flake8
-# suppressions), but it is too hacky and relies on some unsupported quirks.
-#
-# Asking Pylance to add support for these generic callables might be preferable.
+# show the parameters and return types without a hacky workaround.
 ###
 
 _F = TypeVar("_F", bound=Callable[..., str | URL | None])

stubs/SQLAlchemy/sqlalchemy/util/compat.pyi

@@ -10,7 +10,7 @@ from collections import namedtuple as namedtuple  # noqa: Y024  # Actual import
 from contextlib import contextmanager as contextmanager
 from datetime import timezone as timezone
 from functools import reduce as reduce
-from io import BytesIO, StringIO as _StringIO
+from io import BytesIO, StringIO as StringIO
 from itertools import zip_longest as zip_longest
 from time import perf_counter as perf_counter
 from typing import TYPE_CHECKING as TYPE_CHECKING, Any, NamedTuple
@@ -48,10 +48,6 @@ is64bit: bool
 has_refcount_gc: bool
 dottedgetter = operator.attrgetter
 
-class StringIO(_StringIO):
-    def seek(self, __pos: int, __whence: int = 0) -> int: ...
-    def truncate(self, __pos: int | None = None) -> int: ...
-
 class FullArgSpec(NamedTuple):
     args: Any
     varargs: Any

stubs/SQLAlchemy/sqlalchemy/util/langhelpers.pyi

@@ -30,7 +30,7 @@ class PluginLoader:
     def __init__(self, group, auto_fn: Incomplete | None = ...) -> None: ...
     def clear(self) -> None: ...
     def load(self, name): ...
-    def register(self, name, modulepath, objname): ...
+    def register(self, name, modulepath, objname) -> None: ...
 
 def get_cls_kwargs(cls, _set: Incomplete | None = ...): ...
 def get_func_kwargs(func): ...
@@ -129,12 +129,16 @@ class hybridmethod:
     def classlevel(self, func): ...
 
 class _symbol(int):
-    def __new__(cls, name, doc: Incomplete | None = ..., canonical: Incomplete | None = ...): ...
+    def __new__(  # noqa: Y034  # Excplicitely instanciates _symbol
+        self, name, doc: Incomplete | None = ..., canonical: Incomplete | None = ...
+    ) -> _symbol: ...
     def __reduce__(self): ...
 
 class symbol:
     symbols: Any
-    def __new__(cls, name, doc: Incomplete | None = ..., canonical: Incomplete | None = ...): ...
+    def __new__(  # type: ignore[misc]  # Excplicitely instanciates _symbol
+        cls, name, doc: Incomplete | None = ..., canonical: Incomplete | None = ...
+    ) -> _symbol: ...
     @classmethod
     def parse_user_argument(cls, arg, choices, name, resolve_symbol_names: bool = ...): ...