From de604b17656828a0eaf83a8103e29ddbe45a8f55 Mon Sep 17 00:00:00 2001 From: Jeffrey Meadows Date: Thu, 30 Jul 2015 21:13:44 -0700 Subject: [PATCH] Catch requests Timeout instead of urllib3 TimeoutError --- boxsdk/object/events.py | 4 ++-- test/unit/object/test_events.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boxsdk/object/events.py b/boxsdk/object/events.py index 8a014cd77..52c4d8be6 100644 --- a/boxsdk/object/events.py +++ b/boxsdk/object/events.py @@ -1,7 +1,7 @@ # coding: utf-8 from __future__ import unicode_literals -from requests.packages.urllib3.exceptions import TimeoutError +from requests.exceptions import Timeout from boxsdk.object.base_endpoint import BaseEndpoint from boxsdk.util.lru_cache import LRUCache @@ -123,7 +123,7 @@ def generate_events_with_long_polling(self, stream_position=None): while True: try: long_poll_response = self.long_poll(options, stream_position) - except TimeoutError: + except Timeout: break else: message = long_poll_response.json()['message'] diff --git a/test/unit/object/test_events.py b/test/unit/object/test_events.py index e590f59e7..b59dc2fe5 100644 --- a/test/unit/object/test_events.py +++ b/test/unit/object/test_events.py @@ -4,7 +4,7 @@ import json from mock import Mock import pytest -from requests.packages.urllib3.exceptions import TimeoutError +from requests.exceptions import Timeout from boxsdk.network.default_network import DefaultNetworkResponse from boxsdk.object.events import Events from boxsdk.session.box_session import BoxResponse @@ -128,7 +128,7 @@ def test_generate_events_with_long_polling( mock_box_session.options.return_value = options_response mock_box_session.get.side_effect = [ events_response, # initial call to get now stream position - TimeoutError, + Timeout, reconnect_long_poll_response, max_retries_long_poll_response, new_change_long_poll_response,