Fix bug with newer urllib versions (#330)

Author: felix-levert-reddit

pydruid/client.py

@@ -15,7 +15,9 @@
 #
 import json
 import re
-from six.moves import urllib
+import ssl
+import urllib.error
+import urllib.request
 from base64 import b64encode
 
 from pydruid.query import QueryBuilder
@@ -549,13 +551,16 @@ class PyDruid(BaseDruidClient):
 
     def __init__(self, url, endpoint, cafile=None, http_headers=None):
         super(PyDruid, self).__init__(url, endpoint, http_headers=http_headers)
-        self.cafile = cafile
+        self.context = None
+        if cafile:
+            self.context = ssl.create_default_context()
+            self.context.load_verify_locations(cafile=cafile)
 
     def _post(self, query):
         try:
             headers, querystr, url = self._prepare_url_headers_and_body(query)
             req = urllib.request.Request(url, querystr, headers)
-            res = urllib.request.urlopen(url=req, cafile=self.cafile)
+            res = urllib.request.urlopen(url=req, context=self.context)
             data = res.read().decode("utf-8")
             res.close()
         except urllib.error.HTTPError as e:

tests/test_client.py

@@ -201,3 +201,30 @@ def test_client_custom_headers(self):
         query = create_blank_query()
         headers, _, _ = client._prepare_url_headers_and_body(query)
         assert headers["custom-header"] == "test"
+
+    @patch("pydruid.client.urllib.request.urlopen")
+    @patch("pydruid.client.ssl.create_default_context")
+    def test_client_with_cafile(self, mock_create_default_context, mock_urlopen):
+        response = Mock()
+        response.read.return_value = """
+            [ {
+                "timestamp" : "2015-12-30T14:14:49.000Z",
+                "result" : [ {
+                    "dimension" : "aaaa",
+                    "metric" : 100
+                } ]
+            } ]
+        """.encode(
+            "utf-8"
+        )
+        mock_urlopen.return_value = response
+
+        client = PyDruid("http://localhost:8083", "druid/v2/", cafile="tests/cert.pem")
+
+        mock_create_default_context.assert_called_once()
+        context = mock_create_default_context.return_value
+        context.load_verify_locations.assert_called_once_with(cafile="tests/cert.pem")
+        assert client.context == context
+
+        client.topn()
+        assert mock_urlopen.called_with(context=client.context)