From 7e77b3c416f64c8556a483e9f7aa86935c5ed2dc Mon Sep 17 00:00:00 2001
From: John Ladan <jladan@uwaterloo.ca>
Date: Wed, 6 Nov 2013 16:57:35 -0500
Subject: [PATCH] Added an exception for timeout

---
 book_data.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/book_data.py b/book_data.py
index e4c7c7a..2dcf7ed 100644
--- a/book_data.py
+++ b/book_data.py
@@ -5,6 +5,7 @@ except ImportError:
         # Fall back to Python 2's urllib2
             from urllib2 import urlopen,URLError
 from json import loads,dumps
+from socket import timeout
 import sys
 
 """ Library Book Type Description:
@@ -37,8 +38,10 @@ def openLibrary_isbn(ISBN):
     isbn = str(ISBN)
     try:
         jsondata = urlopen("http://openlibrary.org/api/books?format=json&jscmd=data&bibkeys=ISBN:"+isbn, timeout=3)
-    except URLError:
-        return {}
+    except URLError as e:
+        return {'title':e}
+    except timeout:
+        return {'title':'Timeout while connecting to OpenLibrary.org'}
     openBook = loads(jsondata.read().decode('utf-8'))
     if "ISBN:"+isbn not in openBook:
         return {'isbn':isbn,'title':'Book not found'}