Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 1 of 2.

2 files changed, 55 insertions, 55 deletions

diff --git a/contrib/python/urllib3/patches/01-arcadia.patch b/contrib/python/urllib3/patches/01-arcadia.patch
index 22d4aaf235..adb12a8389 100644
--- a/contrib/python/urllib3/patches/01-arcadia.patch
+++ b/contrib/python/urllib3/patches/01-arcadia.patch
@@ -1,24 +1,24 @@
---- contrib/python/urllib3/urllib3/connection.py	(index)
-+++ contrib/python/urllib3/urllib3/connection.py	(working tree)
-@@ -349,7 +349,8 @@ class HTTPSConnection(HTTPConnection):
-         self.key_password = key_password
-         self.assert_hostname = assert_hostname
-         self.assert_fingerprint = assert_fingerprint
--        self.ca_certs = ca_certs and os.path.expanduser(ca_certs)
-+        self.ca_certs = os.path.expanduser(ca_certs) \
-+            if isinstance(ca_certs, six.string_types) else ca_certs
-         self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir)
-         self.ca_cert_data = ca_cert_data
- 
---- contrib/python/urllib3/urllib3/response.py	(index)
-+++ contrib/python/urllib3/urllib3/response.py	(working tree)
-@@ -9,7 +9,8 @@ from socket import timeout as SocketTimeout
- 
- try:
-     import brotli
--except ImportError:
-+    brotli.error
-+except (ImportError, Exception):
-     brotli = None
- 
- from ._collections import HTTPHeaderDict
+--- contrib/python/urllib3/urllib3/connection.py	(index) 
++++ contrib/python/urllib3/urllib3/connection.py	(working tree) 
+@@ -349,7 +349,8 @@ class HTTPSConnection(HTTPConnection): 
+         self.key_password = key_password 
+         self.assert_hostname = assert_hostname 
+         self.assert_fingerprint = assert_fingerprint 
+-        self.ca_certs = ca_certs and os.path.expanduser(ca_certs) 
++        self.ca_certs = os.path.expanduser(ca_certs) \ 
++            if isinstance(ca_certs, six.string_types) else ca_certs 
+         self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir) 
+         self.ca_cert_data = ca_cert_data 
+  
+--- contrib/python/urllib3/urllib3/response.py	(index) 
++++ contrib/python/urllib3/urllib3/response.py	(working tree) 
+@@ -9,7 +9,8 @@ from socket import timeout as SocketTimeout 
+  
+ try: 
+     import brotli 
+-except ImportError: 
++    brotli.error 
++except (ImportError, Exception): 
+     brotli = None 
+  
+ from ._collections import HTTPHeaderDict 
diff --git a/contrib/python/urllib3/patches/02-fix-ya.make.patch b/contrib/python/urllib3/patches/02-fix-ya.make.patch
index 599c7ebf97..a190705a61 100644
--- a/contrib/python/urllib3/patches/02-fix-ya.make.patch
+++ b/contrib/python/urllib3/patches/02-fix-ya.make.patch
@@ -1,31 +1,31 @@
---- contrib/python/urllib3/ya.make	(index)
-+++ contrib/python/urllib3/ya.make	(working tree)
-@@ -24,20 +22,20 @@ PY_SRCS(
-     urllib3/connectionpool.py
-     urllib3/contrib/__init__.py
-     urllib3/contrib/_appengine_environ.py
--    urllib3/contrib/_securetransport/__init__.py
--    urllib3/contrib/_securetransport/bindings.py
--    urllib3/contrib/_securetransport/low_level.py
-+    #urllib3/contrib/_securetransport/__init__.py
-+    #urllib3/contrib/_securetransport/bindings.py
-+    #urllib3/contrib/_securetransport/low_level.py
-     urllib3/contrib/appengine.py
--    urllib3/contrib/ntlmpool.py
--    urllib3/contrib/pyopenssl.py
--    urllib3/contrib/securetransport.py
-+    #urllib3/contrib/ntlmpool.py
-+    #urllib3/contrib/pyopenssl.py
-+    #urllib3/contrib/securetransport.py
-     urllib3/contrib/socks.py
-     urllib3/exceptions.py
-     urllib3/fields.py
-     urllib3/filepost.py
-     urllib3/packages/__init__.py
--    urllib3/packages/backports/__init__.py
--    urllib3/packages/backports/makefile.py
-+    #urllib3/packages/backports/__init__.py
-+    #urllib3/packages/backports/makefile.py
-     urllib3/packages/six.py
-     urllib3/poolmanager.py
-     urllib3/request.py
+--- contrib/python/urllib3/ya.make	(index) 
++++ contrib/python/urllib3/ya.make	(working tree) 
+@@ -24,20 +22,20 @@ PY_SRCS( 
+     urllib3/connectionpool.py 
+     urllib3/contrib/__init__.py 
+     urllib3/contrib/_appengine_environ.py 
+-    urllib3/contrib/_securetransport/__init__.py 
+-    urllib3/contrib/_securetransport/bindings.py 
+-    urllib3/contrib/_securetransport/low_level.py 
++    #urllib3/contrib/_securetransport/__init__.py 
++    #urllib3/contrib/_securetransport/bindings.py 
++    #urllib3/contrib/_securetransport/low_level.py 
+     urllib3/contrib/appengine.py 
+-    urllib3/contrib/ntlmpool.py 
+-    urllib3/contrib/pyopenssl.py 
+-    urllib3/contrib/securetransport.py 
++    #urllib3/contrib/ntlmpool.py 
++    #urllib3/contrib/pyopenssl.py 
++    #urllib3/contrib/securetransport.py 
+     urllib3/contrib/socks.py 
+     urllib3/exceptions.py 
+     urllib3/fields.py 
+     urllib3/filepost.py 
+     urllib3/packages/__init__.py 
+-    urllib3/packages/backports/__init__.py 
+-    urllib3/packages/backports/makefile.py 
++    #urllib3/packages/backports/__init__.py 
++    #urllib3/packages/backports/makefile.py 
+     urllib3/packages/six.py 
+     urllib3/poolmanager.py 
+     urllib3/request.py