fixup issue with ssl_error_classes

Author: julien-lang

shotgun_api3/shotgun.py

@@ -58,7 +58,7 @@
 from .lib import six
 from .lib import sgsix
 from .lib import sgutils
-from .lib.httplib2 import Http, ProxyInfo, socks, ssl_error_classes
+from .lib.httplib2 import Http, ProxyInfo, socks
 from .lib.sgtimezone import SgTimezone
 
 
@@ -3873,7 +3873,7 @@ def _make_call(self, verb, path, body, headers):
                 # otherwise and will not re-attempt.
                 # When we drop support of Python 2 and we will probably drop the
                 # next except, we might want to remove this except too.
-            except ssl_error_classes as e:
+            except (ssl.SSLError, ssl.CertificateError) as e:
                 # Test whether the exception is due to the fact that this is an older version of
                 # Python that cannot validate certificates encrypted with SHA-2. If it is, then
                 # fall back on disabling the certificate validation and try again - unless the

tests/test_unit.py

@@ -11,13 +11,14 @@
 # not expressly granted therein are reserved by Shotgun Software Inc.
 
 import os
+import ssl
 import unittest
 from unittest import mock
 import urllib.request
 import urllib.error
 
 import shotgun_api3 as api
-from shotgun_api3.lib.httplib2 import Http, ssl_error_classes
+from shotgun_api3.lib.httplib2 import Http
 
 
 class TestShotgunInit(unittest.TestCase):
@@ -771,7 +772,7 @@ def test_httplib(self):
         """
         # First check that we get an error when trying to connect to a known dummy bad URL
         self.assertRaises(
-            ssl_error_classes,
+            (ssl.SSLError, ssl.CertificateError),
             self._check_url_with_sg_api_httplib2,
             self.bad_url,
             self.certs,