pep-484: session, instancestate, etc

Also adds some fixes to annotation-based mapping
that have come up, as well as starts to add more
pep-484 test cases

Change-Id: Ia722bbbc7967a11b23b66c8084eb61df9d233fee

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index d7cc32733..99a6baa89 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -3037,7 +3037,9 @@ class ForUpdateArg(ClauseElement):
     skip_locked: bool
 
     @classmethod
-    def _from_argument(cls, with_for_update):
+    def _from_argument(
+        cls, with_for_update: Union[ForUpdateArg, None, bool, Dict[str, Any]]
+    ) -> Optional[ForUpdateArg]:
         if isinstance(with_for_update, ForUpdateArg):
             return with_for_update
         elif with_for_update in (None, False):
@@ -3045,7 +3047,7 @@ class ForUpdateArg(ClauseElement):
         elif with_for_update is True:
             return ForUpdateArg()
         else:
-            return ForUpdateArg(**with_for_update)
+            return ForUpdateArg(**cast("Dict[str, Any]", with_for_update))
 
     def __eq__(self, other):
         return (