From c7e36e4fc1bc230982c93cb12d681307749e514a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
Date: Sun, 29 Sep 2013 15:54:54 -0700
Subject: [PATCH] Catching at the wrong timeout exception

---
 homeassistant/httpinterface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/httpinterface.py b/homeassistant/httpinterface.py
index 79cdb5b5077..5dde42e153a 100644
--- a/homeassistant/httpinterface.py
+++ b/homeassistant/httpinterface.py
@@ -76,7 +76,7 @@ class HTTPInterface(threading.Thread):
         # Trigger a fake request to get the server to quit
         try:
             requests.get("http://127.0.0.1:{}".format(SERVER_PORT), timeout=0.001)
-        except requests.TimeOut:
+        except requests.exceptions.Timeout:
             pass
 
 class RequestHandler(BaseHTTPRequestHandler):