Skip to content

Commit ba6c08d

Browse files
author
Rovshan Mamedov
committed
refactor error catching
1 parent 0f7724a commit ba6c08d

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

rwslib/__init__.py

+9-13
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,15 @@ def send_request(self, request_object, timeout=None, retries=1, preserve_last_re
9999

100100
try:
101101
r = action(full_url, **kwargs) # type: requests.models.Response
102-
except (
103-
requests.exceptions.ConnectTimeout,
104-
requests.exceptions.ReadTimeout,
105-
) as exc:
106-
if isinstance(exc, (requests.exceptions.ConnectTimeout,)):
107-
raise RWSException(
108-
"Server Connection Timeout",
109-
"Connection timeout for {}".format(full_url),
110-
)
111-
elif isinstance(exc, (requests.exceptions.ReadTimeout,)):
112-
raise RWSException(
113-
"Server Read Timeout", "Read timeout for {}".format(full_url)
114-
)
102+
except requests.exceptions.ConnectTimeout:
103+
raise RWSException(
104+
"Server Connection Timeout",
105+
"Connection timeout for {}".format(full_url),
106+
)
107+
except requests.exceptions.ReadTimeout:
108+
raise RWSException(
109+
"Server Read Timeout", "Read timeout for {}".format(full_url)
110+
)
115111

116112
self.request_time = time.time() - start_time
117113
if preserve_last_response:

0 commit comments

Comments
 (0)