From e835e61d0a76c28a62db0bf08eb01c1112356066 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 21 Feb 2015 18:02:32 +0100 Subject: [PATCH] handle Timeout exception as ReadTimeout has been introduced in recent versions of requests --- modules/amazon/browser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/amazon/browser.py b/modules/amazon/browser.py index 4eea32a7..e0d96d6d 100644 --- a/modules/amazon/browser.py +++ b/modules/amazon/browser.py @@ -18,12 +18,13 @@ # along with weboob. If not, see . +from requests.exceptions import Timeout + from weboob.browser import LoginBrowser, URL, need_login from weboob.browser.exceptions import ServerError, HTTPNotFound from weboob.capabilities.base import Currency from weboob.capabilities.shop import OrderNotFound from weboob.exceptions import BrowserIncorrectPassword -from requests.exceptions import ReadTimeout from .pages import HomePage, LoginPage, AmazonPage, HistoryPage, \ OrderOldPage, OrderNewPage @@ -108,6 +109,6 @@ class Amazon(LoginBrowser): for i in xrange(self.MAX_RETRIES): try: return super(Amazon, self).location(*args, **kwargs) - except (ServerError, ReadTimeout) as e: + except (ServerError, Timeout) as e: pass raise e