Merge pull request #3 from zachsnow/dev/timeout

Expose timeout.
kurttheviking · Jun 17, 2013 · e9ad933 · e9ad933
2 parents 842135e + ea275a2
commit e9ad933
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -162,3 +162,9 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+
+
+#############
+## Emacs
+#############
+*~
diff --git a/hipchat/__init__.py b/hipchat/__init__.py
@@ -26,7 +26,7 @@ def get_method(self):
                 return self.method
             return urllib2.Request.get_method(self)
 
-    def method(self, url, method="GET", parameters=None):
+    def method(self, url, method="GET", parameters=None, timeout=None):
         method_url = urljoin(self.url, url)
 
         if method == "GET":
@@ -52,7 +52,7 @@ def method(self, url, method="GET", parameters=None):
         method_url = method_url + '?' + query_string
 
         req = self.RequestWithMethod(method_url, http_method=method, data=request_data)
-        response = self.opener.open(req).read()
+        response = self.opener.open(req, None, timeout).read()
 
         return json.loads(response)