Allow users to use custom http client in the constructor (#589)

Minio constructor has been modified to take a custom http client
from the user.

This prevents the constructor from having too many options.

The next version has been bumped to 3.0.0, since this change
breaks backward compatibility.

Fixes #588

Author: kannappanr

docs/API.md

@@ -44,11 +44,11 @@ s3Client = Minio('s3.amazonaws.com',
 ## 1. Constructor
 
 <a name="Minio"></a>
-### Minio(endpoint, access_key=None, secret_key=None, secure=True)
+### Minio(endpoint, access_key=None, secret_key=None, secure=True, region=None, http_client=None)
 
 |   |
 |---|
-| `Minio(endpoint, access_key=None, secret_key=None, secure=True, region=None, timeout=None)`  |
+| `Minio(endpoint, access_key=None, secret_key=None, secure=True, region=None, http_client=None)`  |
 | Initializes a new client object.  |
 
 __Parameters__
@@ -61,7 +61,7 @@ __Parameters__
 | `secret_key` | _string_  |  Secret key for the object storage endpoint. (Optional if you need anonymous access). |
 | `secure`  |_bool_   | Set this value to `True` to enable secure (HTTPS) access. (Optional defaults to `True`).  |
 | `region`  |_string_ | Set this value to override automatic bucket location discovery. (Optional defaults to `None`). |
-| `timeout` |_float_ | Set this value to control how long requests are allowed to run before being aborted. (Optional defaults to `None`) |
+| `http_client` |_urllib3.poolmanager.PoolManager_ | Set this value to use custom http client instead of using default http client. (Optional defaults to `None`) |
 
 __Example__
 
@@ -76,6 +76,28 @@ minioClient = Minio('play.minio.io:9000',
                     secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG')
 ```
 
+```py
+from minio import Minio
+from minio.error import ResponseError
+import urllib3
+
+httpClient = urllib3.ProxyManager(
+                'https://proxy_host.sampledomain.com:8119/'
+                timeout=urllib3.Timeout.DEFAULT_TIMEOUT,
+                cert_reqs='CERT_REQUIRED',
+                retries=urllib3.Retry(
+                    total=5,
+                    backoff_factor=0.2,
+                    status_forcelist=[500, 502, 503, 504]
+                )
+            )
+minioClient = Minio('your_hostname.sampledomain.com:9000',
+                    access_key='ACCESS_KEY',
+                    secret_key='SECRET_KEY',
+                    secure=True,
+                    http_client=httpClient)
+```
+
 ### AWS S3
 
 ```py

minio/__init__.py

@@ -29,7 +29,7 @@
 
 __title__ = 'minio-py'
 __author__ = 'Minio, Inc.'
-__version__ = '2.2.7'
+__version__ = '3.0.0'
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2015, 2016, 2017 Minio, Inc.'
 

minio/api.py

@@ -125,16 +125,19 @@ class Minio(object):
          are allowed to run before being aborted.
     :return: :class:`Minio <Minio>` object
     """
-
     def __init__(self, endpoint, access_key=None,
                  secret_key=None, secure=True,
                  region=None,
-                 timeout=None,
-                 certificate_bundle=certifi.where()):
+                 http_client=None):
 
         # Validate endpoint.
         is_valid_endpoint(endpoint)
 
+        # Validate http client has correct base class.
+        if http_client and not isinstance(http_client, urllib3.poolmanager.PoolManager):
+            raise InvalidArgumentError('HTTP client should be of instance `urllib3.poolmanager.PoolManager`')
+
+
         # Default is a secured connection.
         endpoint_url = 'https://' + endpoint
         if not secure:
@@ -156,19 +159,19 @@ def __init__(self, endpoint, access_key=None,
         self._user_agent = _DEFAULT_USER_AGENT
         self._trace_output_stream = None
 
-        self._conn_timeout = urllib3.Timeout.DEFAULT_TIMEOUT if not timeout \
-                             else urllib3.Timeout(timeout)
-
-        self._http = urllib3.PoolManager(
-            timeout=self._conn_timeout,
-            cert_reqs='CERT_REQUIRED',
-            ca_certs=certificate_bundle,
-            retries=urllib3.Retry(
-                total=5,
-                backoff_factor=0.2,
-                status_forcelist=[500, 502, 503, 504]
+        if not http_client:
+            self._http = urllib3.PoolManager(
+                timeout=urllib3.Timeout.DEFAULT_TIMEOUT,
+                        cert_reqs='CERT_REQUIRED',
+                        ca_certs=certifi.where(),
+                        retries=urllib3.Retry(
+                            total=5,
+                            backoff_factor=0.2,
+                            status_forcelist=[500, 502, 503, 504]
+                        )
             )
-        )
+        else:
+            self._http = http_client
 
     # Set application information.
     def set_app_info(self, app_name, app_version):