Library import 5, delete go dependencies (#832)

* Library import 5, delete go dependencies

* Fix yt client

4 files changed, 15 insertions, 13 deletions

diff --git a/contrib/python/httplib2/py2/.dist-info/METADATA b/contrib/python/httplib2/py2/.dist-info/METADATA
index 325c6f76b7a..933bfa0bda2 100644
--- a/contrib/python/httplib2/py2/.dist-info/METADATA
+++ b/contrib/python/httplib2/py2/.dist-info/METADATA
@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: httplib2
-Version: 0.20.4
+Version: 0.22.0
 Summary: A comprehensive HTTP client library.
 Home-page: https://github.com/httplib2/httplib2
 Author: Joe Gregorio
 Author-email: [email protected]
 License: MIT
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -22,6 +21,8 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
@@ -72,5 +73,3 @@ A comprehensive HTTP client library, ``httplib2`` supports many features left ou
 
 **Unit Tested**
   A large and growing set of unit tests.
-
-
diff --git a/contrib/python/httplib2/py2/README.md b/contrib/python/httplib2/py2/README.md
index 329c4a48920..61936996c10 100644
--- a/contrib/python/httplib2/py2/README.md
+++ b/contrib/python/httplib2/py2/README.md
@@ -4,6 +4,8 @@ Introduction
 httplib2 is a comprehensive HTTP client library, httplib2.py supports many
 features left out of other HTTP libraries.
 
+If you want to help this project by bug report or code change, [contribution guidelines](contributing.md) may contain useful information.
+
 ### HTTP and HTTPS
 
 HTTPS support is only available if the socket module was
diff --git a/contrib/python/httplib2/py2/httplib2/__init__.py b/contrib/python/httplib2/py2/httplib2/__init__.py
index a9f793d6e85..0f36fabbc8c 100644
--- a/contrib/python/httplib2/py2/httplib2/__init__.py
+++ b/contrib/python/httplib2/py2/httplib2/__init__.py
@@ -17,9 +17,10 @@ __contributors__ = [
     "Sam Ruby",
     "Louis Nyffenegger",
     "Alex Yu",
+    "Lai Han",
 ]
 __license__ = "MIT"
-__version__ = "0.20.4"
+__version__ = "0.22.0"
 
 import base64
 import calendar
@@ -467,7 +468,10 @@ def _decompressContent(response, new_content):
             if encoding == "gzip":
                 content = gzip.GzipFile(fileobj=StringIO.StringIO(new_content)).read()
             if encoding == "deflate":
-                content = zlib.decompress(content, -zlib.MAX_WBITS)
+                try:
+                    content = zlib.decompress(content, zlib.MAX_WBITS)
+                except (IOError, zlib.error):
+                    content = zlib.decompress(content, -zlib.MAX_WBITS)
             response["content-length"] = str(len(content))
             # Record the historical presence of the encoding in a way the won't interfere.
             response["-content-encoding"] = response["content-encoding"]
diff --git a/contrib/python/httplib2/py2/ya.make b/contrib/python/httplib2/py2/ya.make
index 773b4e514bd..7b99907baf4 100644
--- a/contrib/python/httplib2/py2/ya.make
+++ b/contrib/python/httplib2/py2/ya.make
@@ -1,19 +1,16 @@
-# Edited to peerdir certifi, dispatch between py2 and py3, remove
-# certs.txt.
-
 PY2_LIBRARY()
 
-LICENSE(MIT)
-
-VERSION(0.20.4)
+VERSION(0.22.0)
 
-NO_LINT()
+LICENSE(MIT)
 
 PEERDIR(
     contrib/python/certifi
     contrib/python/pyparsing
 )
 
+NO_LINT()
+
 PY_SRCS(
     TOP_LEVEL
     httplib2/__init__.py