Intermediate changes

commit_hash:299e2721e8f5b0e3b5c0075b45894e0c9d963b02

4 files changed, 13 insertions, 18 deletions

diff --git a/contrib/python/httplib2/py3/.dist-info/METADATA b/contrib/python/httplib2/py3/.dist-info/METADATA
index c2fddd314e3..d3d40e06378 100644
--- a/contrib/python/httplib2/py3/.dist-info/METADATA
+++ b/contrib/python/httplib2/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httplib2
-Version: 0.31.0
+Version: 0.31.1
 Summary: A comprehensive HTTP client library.
 Home-page: https://github.com/httplib2/httplib2
 Author: Joe Gregorio
diff --git a/contrib/python/httplib2/py3/httplib2/__init__.py b/contrib/python/httplib2/py3/httplib2/__init__.py
index 43e7b40c964..2624dee3430 100644
--- a/contrib/python/httplib2/py3/httplib2/__init__.py
+++ b/contrib/python/httplib2/py3/httplib2/__init__.py
@@ -16,7 +16,7 @@ __contributors__ = [
     "Lai Han",
 ]
 __license__ = "MIT"
-__version__ = "0.31.0"
+__version__ = "0.31.1"
 
 import base64
 import calendar
diff --git a/contrib/python/httplib2/py3/httplib2/auth.py b/contrib/python/httplib2/py3/httplib2/auth.py
index 4e96222575d..cb2ddc13aaf 100644
--- a/contrib/python/httplib2/py3/httplib2/auth.py
+++ b/contrib/python/httplib2/py3/httplib2/auth.py
@@ -5,32 +5,27 @@ import pyparsing as pp
 from .error import MalformedHeader
 
 
-try:  # pyparsing>=3.0.0
-    downcaseTokens = pp.common.downcaseTokens
-except AttributeError:
-    downcaseTokens = pp.downcaseTokens
-
 UNQUOTE_PAIRS = re.compile(r"\\(.)")
 unquote = lambda s, _, t: UNQUOTE_PAIRS.sub(r"\1", t[0][1:-1])
 
 # https://tools.ietf.org/html/rfc7235#section-1.2
 # https://tools.ietf.org/html/rfc7235#appendix-B
 tchar = "!#$%&'*+-.^_`|~" + pp.nums + pp.alphas
-token = pp.Word(tchar).setName("token")
-token68 = pp.Combine(pp.Word("-._~+/" + pp.nums + pp.alphas) + pp.Optional(pp.Word("=").leaveWhitespace())).setName(
+token = pp.Word(tchar).set_name("token")
+token68 = pp.Combine(pp.Word("-._~+/" + pp.nums + pp.alphas) + pp.Optional(pp.Word("=").leave_whitespace())).set_name(
     "token68"
 )
 
-quoted_string = pp.dblQuotedString.copy().setName("quoted-string").setParseAction(unquote)
-auth_param_name = token.copy().setName("auth-param-name").addParseAction(downcaseTokens)
+quoted_string = pp.dbl_quoted_string.copy().set_name("quoted-string").set_parse_action(unquote)
+auth_param_name = token.copy().set_name("auth-param-name").add_parse_action(pp.common.downcase_tokens)
 auth_param = auth_param_name + pp.Suppress("=") + (quoted_string | token)
-params = pp.Dict(pp.delimitedList(pp.Group(auth_param)))
+params = pp.Dict(pp.DelimitedList(pp.Group(auth_param)))
 
 scheme = token("scheme")
 challenge = scheme + (params("params") | token68("token"))
 
 authentication_info = params.copy()
-www_authenticate = pp.delimitedList(pp.Group(challenge))
+www_authenticate = pp.DelimitedList(pp.Group(challenge))
 
 
 def _parse_authentication_info(headers, headername="authentication-info"):
@@ -40,12 +35,12 @@ def _parse_authentication_info(headers, headername="authentication-info"):
     if not header:
         return {}
     try:
-        parsed = authentication_info.parseString(header)
+        parsed = authentication_info.parse_string(header)
     except pp.ParseException:
         # print(ex.explain(ex))
         raise MalformedHeader(headername)
 
-    return parsed.asDict()
+    return parsed.as_dict()
 
 
 def _parse_www_authenticate(headers, headername="www-authenticate"):
@@ -54,13 +49,13 @@ def _parse_www_authenticate(headers, headername="www-authenticate"):
     if not header:
         return {}
     try:
-        parsed = www_authenticate.parseString(header)
+        parsed = www_authenticate.parse_string(header)
     except pp.ParseException:
         # print(ex.explain(ex))
         raise MalformedHeader(headername)
 
     retval = {
-        challenge["scheme"].lower(): challenge["params"].asDict()
+        challenge["scheme"].lower(): challenge["params"].as_dict()
         if "params" in challenge
         else {"token": challenge.get("token")}
         for challenge in parsed
diff --git a/contrib/python/httplib2/py3/ya.make b/contrib/python/httplib2/py3/ya.make
index c459eebc06d..baf7d8c9ade 100644
--- a/contrib/python/httplib2/py3/ya.make
+++ b/contrib/python/httplib2/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(0.31.0)
+VERSION(0.31.1)
 
 LICENSE(MIT)