Update python-gflags to version 3.1.1

5 files changed, 43 insertions, 2 deletions

diff --git a/third_party/py/gflags/ChangeLog b/third_party/py/gflags/ChangeLog
index 60dc799f5e..542dec3d5b 100644
--- a/third_party/py/gflags/ChangeLog
+++ b/third_party/py/gflags/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 30 00:00:01 2017  Google Inc. <google-gflags@googlegroups.com>
+  * python-gflags: version 3.1.1.
+  * Added PEP8 style method/function aliases.
+
 Tue Nov 01 00:00:01 2016  Google Inc. <google-gflags@googlegroups.com>
   * python-gflags: version 3.1.0.
   * Python3 compatibility
diff --git a/third_party/py/gflags/PKG-INFO b/third_party/py/gflags/PKG-INFO
index f290599483..77adc5c79a 100644
--- a/third_party/py/gflags/PKG-INFO
+++ b/third_party/py/gflags/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-gflags
-Version: 3.1.0
+Version: 3.1.1
 Summary: Google Commandline Flags Module
 Home-page: https://github.com/google/python-gflags
 Author: Google Inc. and others
@@ -9,6 +9,7 @@ License: BSD
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff --git a/third_party/py/gflags/gflags/__init__.py b/third_party/py/gflags/gflags/__init__.py
index 81f4f33437..263bd3602b 100644
--- a/third_party/py/gflags/gflags/__init__.py
+++ b/third_party/py/gflags/gflags/__init__.py
@@ -889,3 +889,12 @@ MarkFlagAsRequired = mark_flag_as_required
 MarkFlagsAsRequired = mark_flags_as_required
 MarkFlagsAsMutualExclusive = mark_flags_as_mutual_exclusive
 # pylint: enable=invalid-name
+
+# New PEP8 style functions.
+get_help_width = GetHelpWidth
+text_wrap = TextWrap
+flag_dict_to_args = FlagDictToArgs
+doc_to_help = DocToHelp
+declare_key_flag = DECLARE_key_flag
+adopt_module_key_flags = ADOPT_module_key_flags
+disclaim_key_flags = DISCLAIM_key_flags
diff --git a/third_party/py/gflags/gflags/flagvalues.py b/third_party/py/gflags/gflags/flagvalues.py
index f6c8f2632d..0e487bbca8 100644
--- a/third_party/py/gflags/gflags/flagvalues.py
+++ b/third_party/py/gflags/gflags/flagvalues.py
@@ -1257,5 +1257,31 @@ class FlagValues(object):
           doc.toprettyxml(indent='  ', encoding='utf-8').decode('utf-8'))
     outfile.flush()
 
+  # New PEP8 style functions.
+  def set_gnu_getopt(self, gnu_getopt=True):
+    self.UseGnuGetOpt(gnu_getopt)
+
+  is_gnu_getopt = IsGnuGetOpt
+  flags_by_module_dict = FlagsByModuleDict
+  flags_by_module_id_dict = FlagsByModuleIdDict
+  key_flags_by_module_dict = KeyFlagsByModuleDict
+  register_key_flag_for_module = _RegisterKeyFlagForModule
+  find_module_defining_flag = FindModuleDefiningFlag
+  find_module_id_defining_flag = FindModuleIdDefiningFlag
+  append_flag_values = AppendFlagValues
+  remove_flag_values = RemoveFlagValues
+  set_default = SetDefault
+  is_parsed = IsParsed
+  mark_as_parsed = MarkAsParsed
+  flag_values_dict = FlagValuesDict
+  module_help = ModuleHelp
+  main_module_help = MainModuleHelp
+  read_flags_from_files = ReadFlagsFromFiles
+  flags_into_string = FlagsIntoString
+  append_flags_into_file = AppendFlagsIntoFile
+  write_help_in_xml_format = WriteHelpInXMLFormat
+  get_key_flags_for_module = _GetKeyFlagsForModule
+  unparse_flags = Reset
+
 
 _helpers.SPECIAL_FLAGS = FlagValues()
diff --git a/third_party/py/gflags/setup.py b/third_party/py/gflags/setup.py
index 663121a7d4..647db3621c 100644
--- a/third_party/py/gflags/setup.py
+++ b/third_party/py/gflags/setup.py
@@ -32,7 +32,7 @@
 from distutils.core import setup
 
 setup(name='python-gflags',
-      version='3.1.0',
+      version='3.1.1',
       description='Google Commandline Flags Module',
       license='BSD',
       author='Google Inc. and others',
@@ -43,6 +43,7 @@ setup(name='python-gflags',
       requires=['six'],
       classifiers=[
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
           'Intended Audience :: Developers',
           'Topic :: Software Development :: Libraries :: Python Modules',