projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e94ddba
)
SSLHandshakeError is Python 2 only refs #17008
author
Michael R. Crusoe <michael.crusoe@gmail.com>
Thu, 15 Oct 2020 15:16:37 +0000
(17:16 +0200)
committer
Peter Amstutz <peter.amstutz@curii.com>
Fri, 16 Oct 2020 13:39:19 +0000
(09:39 -0400)
Arvados-DCO-1.1-Signed-off-by: Michael R. Crusoe <mcrusoe@curii.com>
sdk/python/arvados/api.py
patch
|
blob
|
history
diff --git
a/sdk/python/arvados/api.py
b/sdk/python/arvados/api.py
index ae687c50bd98b62746afae0b3d381c59e5e42bd7..315fc74a713f42fbee7b7b030c36576ed5426bc0 100644
(file)
--- a/
sdk/python/arvados/api.py
+++ b/
sdk/python/arvados/api.py
@@
-14,6
+14,7
@@
import logging
import os
import re
import socket
+import sys
import time
import types
@@
-32,6
+33,9
@@
RETRY_DELAY_INITIAL = 2
RETRY_DELAY_BACKOFF = 2
RETRY_COUNT = 2
+if sys.version_info >= (3,):
+ httplib2.SSLHandshakeError = None
+
class OrderedJsonModel(apiclient.model.JsonModel):
"""Model class for JSON that preserves the contents' order.