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

1 files changed, 29 insertions, 29 deletions

diff --git a/contrib/python/requests/patches/01-arcadia.patch b/contrib/python/requests/patches/01-arcadia.patch
index f7e8351851..c622d7b578 100644
--- a/contrib/python/requests/patches/01-arcadia.patch
+++ b/contrib/python/requests/patches/01-arcadia.patch
@@ -1,29 +1,29 @@
---- contrib/python/requests/requests/adapters.py	(index) 
-+++ contrib/python/requests/requests/adapters.py	(working tree) 
-@@ -224,13 +224,13 @@ class HTTPAdapter(BaseAdapter): 
-             if not cert_loc: 
-                 cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH) 
-  
--            if not cert_loc or not os.path.exists(cert_loc): 
-+            if not cert_loc or isinstance(cert_loc, basestring) and not os.path.exists(cert_loc): 
-                 raise IOError("Could not find a suitable TLS CA certificate bundle, " 
-                               "invalid path: {}".format(cert_loc)) 
-  
-             conn.cert_reqs = 'CERT_REQUIRED' 
-  
--            if not os.path.isdir(cert_loc): 
-+            if not isinstance(cert_loc, basestring) or not os.path.isdir(cert_loc): 
-                 conn.ca_certs = cert_loc 
-             else: 
-                 conn.ca_cert_dir = cert_loc 
---- contrib/python/requests/requests/utils.py	(index) 
-+++ contrib/python/requests/requests/utils.py	(working tree) 
-@@ -246,7 +246,7 @@ def extract_zipped_paths(path): 
-     archive with the location of an extracted copy of the target, or else 
-     just return the provided path unchanged. 
-     """ 
--    if os.path.exists(path): 
-+    if callable(path) or os.path.exists(path): 
-         # this is already a valid path, no need to do anything further 
-         return path 
-  
+--- contrib/python/requests/requests/adapters.py	(index)
++++ contrib/python/requests/requests/adapters.py	(working tree)
+@@ -224,13 +224,13 @@ class HTTPAdapter(BaseAdapter):
+             if not cert_loc:
+                 cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
+ 
+-            if not cert_loc or not os.path.exists(cert_loc):
++            if not cert_loc or isinstance(cert_loc, basestring) and not os.path.exists(cert_loc):
+                 raise IOError("Could not find a suitable TLS CA certificate bundle, "
+                               "invalid path: {}".format(cert_loc))
+ 
+             conn.cert_reqs = 'CERT_REQUIRED'
+ 
+-            if not os.path.isdir(cert_loc):
++            if not isinstance(cert_loc, basestring) or not os.path.isdir(cert_loc):
+                 conn.ca_certs = cert_loc
+             else:
+                 conn.ca_cert_dir = cert_loc
+--- contrib/python/requests/requests/utils.py	(index)
++++ contrib/python/requests/requests/utils.py	(working tree)
+@@ -246,7 +246,7 @@ def extract_zipped_paths(path):
+     archive with the location of an extracted copy of the target, or else
+     just return the provided path unchanged.
+     """
+-    if os.path.exists(path):
++    if callable(path) or os.path.exists(path):
+         # this is already a valid path, no need to do anything further
+         return path
+