Bump python-gflags to 3.1.0, take two

This reverts commit 1fb46ce.
Trying again.

Closes #3363

third_party/py/gflags/BUILD

@@ -8,10 +8,8 @@ filegroup(
 
 py_library(
     name = "gflags",
-    srcs = [
-        "__init__.py",
-        "gflags_validators.py",
-    ],
+    deps = ["//third_party/py/six"],
+    srcs = glob(["**/*.py"]),
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
 )

third_party/py/gflags/CONTRIBUTING.md

@@ -0,0 +1,11 @@
+Want to contribute?
+
+We regret that we are currently unable to accept contributions to python-gflags
+due to some technical issues.
+
+If you have a problem you'd like to have solved, please open a
+[GitHub issue](https://github.com/google/python-gflags/issues) and we'll try to
+resolve it.
+
+Because we can't accept contributions right now, pull requests will be closed
+without review.

third_party/py/gflags/ChangeLog

@@ -1,3 +1,69 @@
+Tue Nov 01 00:00:01 2016  Google Inc. <google-gflags@googlegroups.com>
+  * python-gflags: version 3.1.0.
+  * Python3 compatibility
+  * Removed UnrecognizedFlag exception.
+  * Replaced flags.DuplicateFlag with flags.DuplicateFlagError.
+  * Moved the validators.Error class to exceptions.ValidationError.
+  * Renamed IllegalFlagValue to IllegalFlagValueError.
+  * Removed MutualExclusionValidator class, in favor of flags.MarkFlagsAsMutualExclusive.
+  * Removed FlagValues.AddValidator method.
+  * Removed _helpers.GetMainModule.
+  * Use xml.dom.minidom to create XML strings, instead of manual crafting.
+  * Declared PEP8-style names.
+  * Added examples.
+
+
+
+  * python-gflags: version 3.0.7.
+  * Removed the unused method ShortestUniquePrefixes.
+  * Removed _GetCallingModule function alias.
+
+Fri Aug 05 00:00:01 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.6
+  * Declared pypi package classifiers.
+  * Added support for CLIF flag processing (not included in python-gflags repo
+    yet).
+
+Thu May 12 00:00:01 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.5
+  * Added a warning when FLAGS.SetDefault is used after flags were parsed.
+  * Added new function: MarkFlagsAsRequired.
+
+Fri Apr 15 00:00:01 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.4
+  * One more fix for setup.py - this time about third_party package.
+
+Mon Apr 11 00:00:01 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.3
+  * Fixed setup.py.
+  * --noflag if argument is given is no longer allowed.
+  * Python3 compatibility: removed need for cgi import.
+  * Disallowed unparsed flag usage after FLAGS.Reset()
+
+Thu Feb 09 11:55:00 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.2
+  * Fix MANIFEST.in to include all relevant files.
+
+Thu Feb 04 22:23:00 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.1
+  * Some changes for python3 compatibility.
+  * Automatically generate ordering operations for Flag.
+  * Add optional comma compatibility to whitespace-separated list flags.
+
+Tue Jan 12 16:39:00 2016  Google Inc. <google-gflags@googlegroups.com>
+
+  * python-gflags: version 3.0.0.
+  * A lot of potentially backwards incompatible changes since 2.0.
+  * This version is NOT recommended to use in production. Some of the files and
+    documentation has been lost during export; this will be fixed in next
+    versions.
+
 Wed Jan 18 13:57:39 2012  Google Inc. <google-gflags@googlegroups.com>
 
 	* python-gflags: version 2.0

third_party/py/gflags/MANIFEST.in

@@ -3,17 +3,14 @@ include COPYING
 include ChangeLog
 include MANIFEST.in
 include Makefile
-include NEWS
 include README
+include *.md
 include debian/README
 include debian/changelog
 include debian/compat
 include debian/control
 include debian/copyright
 include debian/docs
 include debian/rules
-include gflags.py
-include gflags2man.py
-include gflags_validators.py
-include setup.py
-recursive-include tests *.py
+include *.py
+recursive-include gflags *

third_party/py/gflags/PKG-INFO

@@ -1,10 +1,17 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: python-gflags
-Version: 2.0
+Version: 3.1.0
 Summary: Google Commandline Flags Module
-Home-page: http://code.google.com/p/python-gflags
+Home-page: https://github.com/google/python-gflags
 Author: Google Inc. and others
 Author-email: google-gflags@googlegroups.com
 License: BSD
 Description: UNKNOWN
 Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Requires: six

third_party/py/gflags/README.md

@@ -1,6 +1,6 @@
-[gflags](https://python-gflags.googlecode.com)
+[gflags](https://github.com/google/python-gflags)
 --------
 
-* Version: 2.0
+* Version: 3.1.0
 * License: New BSD License
-* From: [https://python-gflags.googlecode.com/files/python-gflags-2.0.tar.gz](https://python-gflags.googlecode.com/files/python-gflags-2.0.tar.gz)
+* From: [https://pypi.python.org/packages/82/9c/7ed91459f01422d90a734afcf30de7df6b701b90a2e7c7a7d01fd580242d/python-gflags-3.1.0.tar.gz](https://pypi.python.org/packages/82/9c/7ed91459f01422d90a734afcf30de7df6b701b90a2e7c7a7d01fd580242d/python-gflags-3.1.0.tar.gz)