Merge pull request #191 from yilei/push_up_to_452372418

Push up to 452372418

Author: yilei

CHANGELOG.md

@@ -6,9 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com).
 
 ## Unreleased
 
+Nothing notable unreleased.
+
+## 1.1.0 (2022-06-01)
+
 *   `Flag` instances now raise an error if used in a bool context. This prevents
     the occasional mistake of testing an instance for truthiness rather than
     testing `flag.value`.
+*   `absl-py` no longer depends on `six`.
 
 ## 1.0.0 (2021-11-09)
 

WORKSPACE

@@ -12,16 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 workspace(name = "io_abseil_py")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "six_archive",
-    build_file = "@//third_party:six.BUILD",
-    sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
-    strip_prefix = "six-1.10.0",
-    urls = [
-        "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
-        "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
-    ],
-)

absl/BUILD

@@ -21,13 +21,6 @@ py_library(
     visibility = ["//visibility:public"],
 )
 
-py_library(
-    name = "_collections_abc",
-    srcs = ["_collections_abc.py"],
-    visibility = [":__subpackages__"],
-    deps = ["@six_archive//:six"],
-)
-
 py_library(
     name = "tests/app_test_helper",
     testonly = 1,

absl/_collections_abc.py

@@ -13,7 +13,6 @@ py_library(
         ":_flagvalues",
         ":_helpers",
         ":_validators",
-        "@six_archive//:six",
     ],
 )
 
@@ -31,7 +30,6 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":_helpers",
-        "@six_archive//:six",
     ],
 )
 
@@ -66,8 +64,6 @@ py_library(
         ":_argument_parser",
         ":_exceptions",
         ":_helpers",
-        "//absl:_collections_abc",
-        "@six_archive//:six",
     ],
 )
 
@@ -80,15 +76,13 @@ py_library(
         ":_flag",
         ":_helpers",
         ":_validators_classes",
-        "@six_archive//:six",
     ],
 )
 
 py_library(
     name = "_helpers",
     srcs = ["_helpers.py"],
     srcs_version = "PY2AND3",
-    deps = ["@six_archive//:six"],
 )
 
 py_library(

absl/flags/BUILD

@@ -25,10 +25,6 @@
 and optionally type-converted, when it's seen on the command line.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import getopt
 import os
 import re
@@ -43,7 +39,6 @@
 from absl.flags import _flagvalues
 from absl.flags import _helpers
 from absl.flags import _validators
-import six
 
 # Initialize the FLAGS_MODULE as early as possible.
 # It's only used by adopt_module_key_flags to take SPECIAL_FLAGS into account.

absl/flags/__init__.py

@@ -18,22 +18,17 @@
 aliases defined at the package level instead.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import collections
 import csv
 import io
 import string
 
 from absl.flags import _helpers
-import six
 
 
 def _is_integer_type(instance):
   """Returns True if instance is an integer, and not a bool."""
-  return (isinstance(instance, six.integer_types) and
+  return (isinstance(instance, int) and
           not isinstance(instance, bool))
 
 
@@ -95,7 +90,7 @@ def __call__(cls, *args, **kwargs):
 #   inherit from `ArgumentParser` and not `ArgumentParser[SomeType]`.
 #   The corresponding DEFINE_someType method (the public API) can be annotated
 #   to return FlagHolder[SomeType].
-class ArgumentParser(six.with_metaclass(_ArgumentParserCache, object)):
+class ArgumentParser(metaclass=_ArgumentParserCache):
   """Base class used to parse and convert arguments.
 
   The parse() method checks to make sure that the string argument is a
@@ -128,7 +123,7 @@ def parse(self, argument):
     Returns:
       The parsed value in native type.
     """
-    if not isinstance(argument, six.string_types):
+    if not isinstance(argument, str):
       raise TypeError('flag value must be a string, found "{}"'.format(
           type(argument)))
     return argument
@@ -228,7 +223,7 @@ def __init__(self, lower_bound=None, upper_bound=None):
   def convert(self, argument):
     """Returns the float value of argument."""
     if (_is_integer_type(argument) or isinstance(argument, float) or
-        isinstance(argument, six.string_types)):
+        isinstance(argument, str)):
       return float(argument)
     else:
       raise TypeError(
@@ -274,7 +269,7 @@ def convert(self, argument):
     """Returns the int value of argument."""
     if _is_integer_type(argument):
       return argument
-    elif isinstance(argument, six.string_types):
+    elif isinstance(argument, str):
       base = 10
       if len(argument) > 2 and argument[0] == '0':
         if argument[1] == 'o':
@@ -296,14 +291,14 @@ class BooleanParser(ArgumentParser):
 
   def parse(self, argument):
     """See base class."""
-    if isinstance(argument, six.string_types):
+    if isinstance(argument, str):
       if argument.lower() in ('true', 't', '1'):
         return True
       elif argument.lower() in ('false', 'f', '0'):
         return False
       else:
         raise ValueError('Non-boolean argument to boolean flag', argument)
-    elif isinstance(argument, six.integer_types):
+    elif isinstance(argument, int):
       # Only allow bool or integer 0, 1.
       # Note that float 1.0 == True, 0.0 == False.
       bool_value = bool(argument)
@@ -433,7 +428,7 @@ def parse(self, argument):
     """
     if isinstance(argument, self.enum_class):
       return argument
-    elif not isinstance(argument, six.string_types):
+    elif not isinstance(argument, str):
       raise ValueError(
           '{} is not an enum member or a name of a member in {}'.format(
               argument, self.enum_class))
@@ -496,18 +491,10 @@ def __init__(self, list_sep):
 
   def serialize(self, value):
     """Serializes a list as a CSV string or unicode."""
-    if six.PY2:
-      # In Python2 csv.writer doesn't accept unicode, so we convert to UTF-8.
-      output = io.BytesIO()
-      writer = csv.writer(output, delimiter=self.list_sep)
-      writer.writerow([unicode(x).encode('utf-8') for x in value])  # pylint: disable=undefined-variable
-      serialized_value = output.getvalue().decode('utf-8').strip()
-    else:
-      # In Python3 csv.writer expects a text stream.
-      output = io.StringIO()
-      writer = csv.writer(output, delimiter=self.list_sep)
-      writer.writerow([str(x) for x in value])
-      serialized_value = output.getvalue().strip()
+    output = io.StringIO()
+    writer = csv.writer(output, delimiter=self.list_sep)
+    writer.writerow([str(x) for x in value])
+    serialized_value = output.getvalue().strip()
 
     # We need the returned value to be pure ascii or Unicodes so that
     # when the xml help is generated they are usefully encodable.

absl/flags/_argument_parser.py

@@ -18,18 +18,13 @@
 aliases defined at the package level instead.
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
+from collections import abc
 import copy
 import functools
 
-from absl._collections_abc import abc
 from absl.flags import _argument_parser
 from absl.flags import _exceptions
 from absl.flags import _helpers
-import six
 
 
 @functools.total_ordering
@@ -411,7 +406,7 @@ def parse(self, arguments):
 
   def _parse(self, arguments):
     if (isinstance(arguments, abc.Iterable) and
-        not isinstance(arguments, six.string_types)):
+        not isinstance(arguments, str)):
       arguments = list(arguments)
 
     if not isinstance(arguments, list):

absl/flags/_flag.py

@@ -17,10 +17,8 @@
 import copy
 import functools
 
-from absl._collections_abc import abc
 from absl.flags import _argument_parser
 import enum
-import six
 
 from typing import Text, TypeVar, Generic, Iterable, Type, List, Optional, Any, Union, Sequence