Skip to content

Catch requests Timeout instead of urllib3 TimeoutError #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2015
Merged

Catch requests Timeout instead of urllib3 TimeoutError #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boxsdk/object/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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']
Expand Down
4 changes: 2 additions & 2 deletions test/unit/object/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down