merge master -Dorg -Ssuccess-only: PR 305 (Ensure we are using pyopen…

…ssl (See ome#240))
snoopycrimecop · Oct 17, 2021 · 7dd16af · 7dd16af
2 parents 13ea176 + 7a3bdf1
commit 7dd16af
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/omero/util/upgrade_check.py b/src/omero/util/upgrade_check.py
@@ -15,6 +15,13 @@
 import requests
 standard_library.install_aliases()
 
+# Ensure we are using pyopenssl (ome/omero-py#240)
+try:
+    import urllib3.contrib.pyopenssl
+    urllib3.contrib.pyopenssl.inject_into_urllib3()
+except ImportError:
+    pass
+
 
 class UpgradeCheck(object):