Merge pull request #195 from yilei/push_up_to_461698919

Push up to 461698919

Author: yilei

CHANGELOG.md

@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com).
 
 Nothing notable unreleased.
 
+## 1.2.0 (2022-07-18)
+
+### Fixed
+
+*   Fixed a crash in Python 3.11 when `TempFileCleanup.SUCCESS` is used.
+
 ## 1.1.0 (2022-06-01)
 
 *   `Flag` instances now raise an error if used in a bool context. This prevents

absl/app.py

@@ -25,10 +25,6 @@ def main(argv):
       app.run(main)
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import collections
 import errno
 import os

absl/command_name.py

@@ -14,10 +14,6 @@
 
 """A tiny stand alone library to change the kernel process name on Linux."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import os
 import sys
 

absl/flags/_defines.py

@@ -17,10 +17,6 @@
 aliases defined at the package level instead.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import sys
 import types
 

absl/flags/_defines.pyi

@@ -576,7 +576,23 @@ def DEFINE_multi_enum(
 @overload
 def DEFINE_multi_enum_class(
     name: Text,
-    default: Union[None, Iterable[_ET], _ET, Text],
+    # This is separate from `Union[None, _ET, Text]` to avoid a Pytype issue
+    # inferring the return value to FlagHolder[List[Union[_ET, enum.Enum]]]
+    # when an iterable of concrete enum subclasses are used.
+    default: Iterable[_ET],
+    enum_class: Type[_ET],
+    help: Text,
+    flag_values: _flagvalues.FlagValues = ...,
+    module_name: Optional[Text] = ...,
+    *,
+    required: Literal[True],
+    **args: Any) -> _flagvalues.FlagHolder[List[_ET]]:
+  ...
+
+@overload
+def DEFINE_multi_enum_class(
+    name: Text,
+    default: Union[None, _ET, Text],
     enum_class: Type[_ET],
     help: Text,
     flag_values: _flagvalues.FlagValues = ...,
@@ -601,7 +617,10 @@ def DEFINE_multi_enum_class(
 @overload
 def DEFINE_multi_enum_class(
     name: Text,
-    default: Union[Iterable[_ET], _ET, Text],
+    # This is separate from `Union[None, _ET, Text]` to avoid a Pytype issue
+    # inferring the return value to FlagHolder[List[Union[_ET, enum.Enum]]]
+    # when an iterable of concrete enum subclasses are used.
+    default: Iterable[_ET],
     enum_class: Type[_ET],
     help: Text,
     flag_values: _flagvalues.FlagValues = ...,
@@ -610,6 +629,17 @@ def DEFINE_multi_enum_class(
     **args: Any) -> _flagvalues.FlagHolder[List[_ET]]:
   ...
 
+@overload
+def DEFINE_multi_enum_class(
+    name: Text,
+    default: Union[_ET, Text],
+    enum_class: Type[_ET],
+    help: Text,
+    flag_values: _flagvalues.FlagValues = ...,
+    module_name: Optional[Text] = ...,
+    required: bool = ...,
+    **args: Any) -> _flagvalues.FlagHolder[List[_ET]]:
+  ...
 
 
 def DEFINE_alias(

absl/flags/_exceptions.py

@@ -18,10 +18,6 @@
 aliases defined at the package level instead.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import sys
 
 from absl.flags import _helpers

absl/flags/_helpers.py

@@ -14,10 +14,6 @@
 
 """Internal helper functions for Abseil Python flags library."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import collections
 import os
 import re

absl/flags/_validators.py

@@ -32,10 +32,6 @@
 aliases defined at the package level instead.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import warnings
 
 from absl.flags import _exceptions

absl/flags/_validators_classes.py

@@ -18,10 +18,6 @@
 private APIs.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from absl.flags import _exceptions
 
 

absl/flags/argparse_flags.py

@@ -88,10 +88,6 @@
    3) argparse_flags supports `-h`; absl.app does not.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import argparse
 import sys