Using a ssl context object to avoid deprecation warnings in py3

python-twitter-tools · Sep 14, 2022 · fbc7aa5 · fbc7aa5
1 parent 9f718d6
commit fbc7aa5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/twitter/api.py b/twitter/api.py
@@ -371,13 +371,17 @@ def __call__(self, **kwargs):
             return self._handle_response(req, uri, arg_data, _timeout)
 
     def _handle_response(self, req, uri, arg_data, _timeout=None):
-        kwargs = {'cafile': certifi.where()}
+        kwargs = {}
         if _timeout:
             kwargs['timeout'] = _timeout
         try:
             context = None
-            if not self.verify_context and _HAVE_SSL:
-                context = ssl._create_unverified_context()
+            if _HAVE_SSL:
+                if not self.verify_context:
+                    context = ssl._create_unverified_context()
+                else:
+                    context = ssl.create_default_context()
+                    context.load_verify_locations(cafile=certifi.where())
             kwargs['context'] = context
             handle = urllib_request.urlopen(req, **kwargs)
             if handle.headers['Content-Type'] in ['image/jpeg', 'image/png']:

diff --git a/twitter/stream.py b/twitter/stream.py
@@ -219,9 +219,13 @@ def __iter__(self):
 def handle_stream_response(req, uri, arg_data, block, timeout, heartbeat_timeout, verify_context=True):
     try:
         context = None
-        if not verify_context and _HAVE_SSL:
-            context = ssl._create_unverified_context()
-        handle = urllib_request.urlopen(req, context=context, cafile=certifi.where())
+        if _HAVE_SSL:
+            if not verify_context:
+                context = ssl._create_unverified_context()
+            else:
+                context = ssl.create_default_context()
+                context.load_verify_locations(cafile=certifi.where())
+        handle = urllib_request.urlopen(req, context=context)
     except urllib_error.HTTPError as e:
         raise TwitterHTTPError(e, uri, 'json', arg_data)
     return iter(TwitterJSONIter(handle, uri, arg_data, block, timeout, heartbeat_timeout))