Fix import of _thread_by_func and pin urllib3==1.23 (#3782)

Author: zippolyte

requirements.txt

@@ -32,6 +32,9 @@ pyyaml==3.11
 # note: requests is also used in many checks
 # upgrade with caution
 requests==2.19.1
+# We need to pin this explicitely because both python-etcd and requests depend on urllib3
+# but even though requests pins urllib3 < 1.24, python-etcd does not and pip installs the latest anyway.
+urllib3==1.23
 # note: simplejson is used in many checks to inteface APIs
 simplejson==3.6.5
 supervisor==3.3.3

tests/core/test_timeout.py

@@ -3,7 +3,8 @@
 import time
 
 # datadog
-from utils.timeout import _thread_by_func, timeout, TimeoutException
+from utils.timeout import timeout, TimeoutException
+from datadog_checks.base.utils.timeout import _thread_by_func
 
 count = 0
 

utils/timeout.py

@@ -5,6 +5,5 @@
 from datadog_checks.utils.timeout import ( # noqa F401
     TimeoutException,
     ThreadMethod,
-    timeout,
-    _thread_by_func
+    timeout
 )