From c4bf876f6f99894ac6ccf90c0223dade3632d460 Mon Sep 17 00:00:00 2001
From: Piper Merriam <pipermerriam@gmail.com>
Date: Tue, 10 Jan 2017 14:01:24 -0700
Subject: [PATCH] dirty

---
 tests/providers/conftest.py          |  2 --
 web3/providers/rpc.py                | 17 +----------------
 web3/utils/compat/compat_gevent.py   |  3 +++
 web3/utils/compat/compat_requests.py |  1 +
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/tests/providers/conftest.py b/tests/providers/conftest.py
index c88cf86..93fb24c 100644
--- a/tests/providers/conftest.py
+++ b/tests/providers/conftest.py
@@ -39,8 +39,6 @@ def disconnected_provider(request):
             provider.thread.kill()
         except AttributeError:
             provider.server.shutdown()
-        finally:
-            provider.thread.join()
         return provider
     elif request.param == 'rpc':
         return RPCProvider(port=get_open_port())
diff --git a/web3/providers/rpc.py b/web3/providers/rpc.py
index e731f6c..8546d33 100644
--- a/web3/providers/rpc.py
+++ b/web3/providers/rpc.py
@@ -58,8 +58,6 @@ class RPCProvider(HTTPProvider):
                  port=8545,
                  path="/",
                  ssl=False,
-                 connection_timeout=10,
-                 network_timeout=10,
                  **kwargs):
         netloc = "{0}:{1}".format(host, port)
         endpoint_uri = urlunparse((
@@ -70,13 +68,8 @@ class RPCProvider(HTTPProvider):
             '',
             ''
         ))
-        request_kwargs = {
-            'connection_timeout': connection_timeout,
-            'network_timeout': network_timeout,
-        }
-        request_kwargs.update(kwargs)
 
-        super(RPCProvider, self).__init__(endpoint_uri, request_kwargs)
+        super(RPCProvider, self).__init__(endpoint_uri, kwargs)
 
 
 class KeepAliveRPCProvider(RPCProvider):
@@ -87,18 +80,10 @@ class KeepAliveRPCProvider(RPCProvider):
                  host="127.0.0.1",
                  port=8545,
                  path="/",
-                 ssl=False,
-                 connection_timeout=10,
-                 network_timeout=10,
-                 concurrency=10,
                  **kwargs):
         super(KeepAliveRPCProvider, self).__init__(
             host,
             port,
             path,
-            ssl,
-            connection_timeout,
-            network_timeout,
-            concurrency=10,
             **kwargs
         )
diff --git a/web3/utils/compat/compat_gevent.py b/web3/utils/compat/compat_gevent.py
index 56bab10..4d7d0b1 100644
--- a/web3/utils/compat/compat_gevent.py
+++ b/web3/utils/compat/compat_gevent.py
@@ -67,6 +67,9 @@ def make_post_request(endpoint_uri, data, **kwargs):
             raise ValueError("Unsupported scheme: '{0}'".format(url_parts.scheme))
 
     kwargs.setdefault('ssl', url_parts.scheme == 'https')
+    kwargs.setdefault('connection_timeout', 10)
+    kwargs.setdefault('network_timeout', 10)
+    kwargs.setdefault('concurrency', 10)
 
     client = _get_client(host, port, **kwargs)
     response = client.post(url_parts.path, body=data)
diff --git a/web3/utils/compat/compat_requests.py b/web3/utils/compat/compat_requests.py
index 97a5654..d866276 100644
--- a/web3/utils/compat/compat_requests.py
+++ b/web3/utils/compat/compat_requests.py
@@ -2,6 +2,7 @@ import requests
 
 
 def make_post_request(endpoint_uri, data, *args, **kwargs):
+    kwargs.setdefault('timeout', 10)
     response = requests.post(endpoint_uri, data=data, *args, **kwargs)
     response.raise_for_status()