Update connect function in api.py to accept proxies (#185)

* Update api.py

added proxies as input parameter for connection

* fix issues raised from flake8

* modify testcase test_context to expect proxies=None as one of the paramters being sent

* resolve rebase merge conflicts and add trailing comma

Author: manojbalaji1

pydruid/db/api.py

@@ -30,6 +30,7 @@ def connect(
     context=None,
     header=False,
     ssl_verify_cert=True,
+    proxies=None,
 ):  # noqa: E125
     """
     Constructor for creating a connection to the database.
@@ -39,17 +40,19 @@ def connect(
 
     """
     context = context or {}
+
     return Connection(
-                host,
-                port,
-                path,
-                scheme,
-                user,
-                password,
-                context,
-                header,
-                ssl_verify_cert,
-            )
+        host,
+        port,
+        path,
+        scheme,
+        user,
+        password,
+        context,
+        header,
+        ssl_verify_cert,
+        proxies,
+    )
 
 
 def check_closed(f):
@@ -116,7 +119,6 @@ def get_type(value):
 
 
 class Connection(object):
-
     """Connection to a Druid database."""
 
     def __init__(
@@ -130,6 +132,7 @@ def __init__(
         context=None,
         header=False,
         ssl_verify_cert=True,
+        proxies=None,
     ):
         netloc = "{host}:{port}".format(host=host, port=port)
         self.url = parse.urlunparse((scheme, netloc, path, None, None, None))
@@ -140,6 +143,7 @@ def __init__(
         self.user = user
         self.password = password
         self.ssl_verify_cert = ssl_verify_cert
+        self.proxies = proxies
 
     @check_closed
     def close(self):
@@ -163,14 +167,17 @@ def commit(self):
     @check_closed
     def cursor(self):
         """Return a new Cursor Object using the connection."""
+
         cursor = Cursor(
-                    self.url,
-                    self.user,
-                    self.password,
-                    self.context,
-                    self.header,
-                    self.ssl_verify_cert,
-                )
+            self.url,
+            self.user,
+            self.password,
+            self.context,
+            self.header,
+            self.ssl_verify_cert,
+            self.proxies,
+        )
+
         self.cursors.append(cursor)
 
         return cursor
@@ -188,7 +195,6 @@ def __exit__(self, *exc):
 
 
 class Cursor(object):
-
     """Connection cursor."""
 
     def __init__(
@@ -199,13 +205,15 @@ def __init__(
         context=None,
         header=False,
         ssl_verify_cert=True,
+        proxies=None,
     ):
         self.url = url
         self.context = context or {}
         self.header = header
         self.user = user
         self.password = password
         self.ssl_verify_cert = ssl_verify_cert
+        self.proxies = proxies
 
         # This read/write attribute specifies the number of rows to fetch at a
         # time with .fetchmany(). It defaults to 1 meaning to fetch a single
@@ -335,6 +343,7 @@ def _stream_query(self, query):
             json=payload,
             auth=auth,
             verify=self.ssl_verify_cert,
+            proxies=self.proxies,
         )
         if r.encoding is None:
             r.encoding = "utf-8"

tests/db/test_cursor.py

@@ -63,7 +63,8 @@ def test_context(self, requests_post_mock):
             stream=True,
             headers={'Content-Type': 'application/json'},
             json={'query': query, 'context': context, 'header': False},
-            verify=True
+            verify=True,
+            proxies=None,
         )
 
     @patch('requests.post')