actually apply timeout to requests in helpers (git/pypi/travis)

Author: sommersoft

adabot/circuitpython_libraries.py

@@ -262,8 +262,8 @@ def list_repos():
                         params={"q":"Adafruit_CircuitPython in:name fork:true",
                                 "per_page": 100,
                                 "sort": "updated",
-                                "order": "asc"},
-                        timeout=15)
+                                "order": "asc"}
+                        )
     while result.ok:
         links = result.headers["Link"]
         #repos.extend(result.json()["items"]) # uncomment and comment below, to include all forks

adabot/github_requests.py

@@ -52,26 +52,24 @@ def _fix_kwargs(kwargs):
             kwargs["params"]["access_token"] = access_token
         else:
             kwargs["params"] = {"access_token": access_token}
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = 30
     return kwargs
 
 def get(url, **kwargs):
-    response = requests.get(_fix_url(url), **_fix_kwargs(kwargs))
+    response = requests.get(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))
     if "X-RateLimit-Remaining" in response.headers:
         remaining = int(response.headers["X-RateLimit-Remaining"])
         if remaining % 100 == 0:
             print(remaining, "requests remaining this hour")
     return response
 
 def post(url, **kwargs):
-    return requests.post(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.post(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))
 
 def put(url, **kwargs):
-    return requests.put(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.put(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))
 
 def patch(url, **kwargs):
-    return requests.patch(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.patch(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))
 
 def delete(url, **kwargs):
-    return requests.delete(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.delete(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))

adabot/pypi_requests.py

@@ -37,10 +37,5 @@ def _fix_url(url):
         url = "https://pypi.org" + url
     return url
 
-def _fix_kwargs(kwargs):
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = 30
-    return kwargs
-
 def get(url, **kwargs):
-    return requests.get(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.get(_fix_url(url), timeout=30, **kwargs)

adabot/travis_requests.py

@@ -56,15 +56,13 @@ def _fix_kwargs(kwargs):
             "User-Agent": user_agent,
             "Travis-API-Version": "3"
         }
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = 30
     return kwargs
 
 def get(url, **kwargs):
-    return requests.get(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.get(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))
 
 def post(url, **kwargs):
-    return requests.post(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.post(_fix_url(url), timeout=30, **_fix_kwargs(kwargs))
 
 def put(url, **kwargs):
-    return requests.put(_fix_url(url), **_fix_kwargs(kwargs))
+    return requests.put(_fix_url(url), timeout=30 **_fix_kwargs(kwargs))