Fix typechecking errors that appeared under mypy release 1.16

The following errors are now in GH Actions at HEAD:

    absl/flags/_helpers.py:108: error: Argument 1 to "get" of "dict" has incompatible type "Any | None"; expected "str"  [arg-type]
    absl/flags/_helpers.py:111: error: Argument 2 to "_ModuleObjectAndName" has incompatible type "str | Any | None"; expected "str"  [arg-type]
    absl/testing/absltest.py:2745: error: Incompatible types in assignment (expression has type "str", variable has type "_T")  [assignment]

To resolve these errors more constructively, I also change the interface of `_ModuleObjectAndName`: instead of a tuple of Optionals, it's an Optional tuple now. The whole file is private, so changing the API is OK.

PiperOrigin-RevId: 766637390

Author: oprypin

absl/flags/_defines.py

@@ -363,8 +363,9 @@ def disclaim_key_flags() -> None:
   any more flags.  This function will affect all FlagValues objects.
   """
   globals_for_caller = sys._getframe(1).f_globals  # pylint: disable=protected-access
-  module, _ = _helpers.get_module_object_and_name(globals_for_caller)
-  _helpers.disclaim_module_ids.add(id(module))
+  module = _helpers.get_module_object_and_name(globals_for_caller)
+  if module is not None:
+    _helpers.disclaim_module_ids.add(id(module.module))
 
 
 @overload

absl/flags/_helpers.py

@@ -87,13 +87,13 @@ class _ModuleObjectAndName(NamedTuple):
   - module: object, module object.
   - module_name: str, module name.
   """
-  module: Optional[types.ModuleType]
+  module: types.ModuleType
   module_name: str
 
 
 def get_module_object_and_name(
-    globals_dict: Dict[str, Any]
-) -> _ModuleObjectAndName:
+    globals_dict: Dict[str, Any],
+) -> Optional[_ModuleObjectAndName]:
   """Returns the module that defines a global environment, and its name.
 
   Args:
@@ -102,10 +102,13 @@ def get_module_object_and_name(
 
   Returns:
     _ModuleObjectAndName - pair of module object & module name.
-    Returns (None, None) if the module could not be identified.
+    Returns None if the module could not be identified.
   """
-  name = globals_dict.get('__name__', None)
-  module = sys.modules.get(name, None)
+  try:
+    name = globals_dict['__name__']
+    module = sys.modules[name]
+  except KeyError:
+    return None
   # Pick a more informative name for the main module.
   return _ModuleObjectAndName(module,
                               (sys.argv[0] if name == '__main__' else name))
@@ -127,9 +130,9 @@ def get_calling_module_object_and_name() -> _ModuleObjectAndName:
     # sys._getframe is the right thing to use here, as it's the best
     # way to walk up the call stack.
     globals_for_frame = sys._getframe(depth).f_globals  # pylint: disable=protected-access
-    module, module_name = get_module_object_and_name(globals_for_frame)
-    if id(module) not in disclaim_module_ids and module_name is not None:
-      return _ModuleObjectAndName(module, module_name)
+    module = get_module_object_and_name(globals_for_frame)
+    if module is not None and id(module.module) not in disclaim_module_ids:
+      return module
   raise AssertionError('No module was found')
 
 

absl/testing/absltest.py

@@ -2746,7 +2746,7 @@ def _run_and_get_tests_result(
   else:
     xml_output_file = get_default_xml_output_filename()
     if xml_output_file:
-      FLAGS.xml_output_file = xml_output_file
+      FLAGS.xml_output_file = xml_output_file  # type: ignore[assignment]
 
   xml_buffer = None
   if xml_output_file: