Skip to content

Commit 1ba92b2

Browse files
committed
#7: fix wrong exception handling
1 parent af6d497 commit 1ba92b2

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

orthanc_api_client/http_client.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ def get(self, endpoint: str, **kwargs) -> requests.Response:
4545
try:
4646
url = self.get_abs_url(endpoint)
4747
response = self._http_session.get(url, **kwargs)
48+
49+
self._raise_on_errors(response, url=url)
50+
return response
4851
except requests.RequestException as request_exception:
4952
self._translate_exception(request_exception, url=url)
5053

51-
self._raise_on_errors(response, url=url)
52-
return response
53-
5454
def get_json(self, endpoint: str, **kwargs) -> Any:
5555
return self.get(endpoint, **kwargs).json()
5656

@@ -61,32 +61,32 @@ def post(self, endpoint: str, **kwargs) -> requests.Response:
6161
try:
6262
url = self.get_abs_url(endpoint)
6363
response = self._http_session.post(url, **kwargs)
64+
65+
self._raise_on_errors(response, url=url)
66+
return response
6467
except requests.RequestException as request_exception:
6568
self._translate_exception(request_exception, url=url)
6669

67-
self._raise_on_errors(response, url=url)
68-
return response
69-
7070
def put(self, endpoint: str, **kwargs) -> requests.Response:
7171
try:
7272
url = self.get_abs_url(endpoint)
7373
response = self._http_session.put(url, **kwargs)
74+
75+
self._raise_on_errors(response, url=url)
76+
return response
7477
except requests.RequestException as request_exception:
7578
self._translate_exception(request_exception, url=url)
7679

77-
self._raise_on_errors(response, url=url)
78-
return response
79-
8080
def delete(self, endpoint: str, **kwargs) -> requests.Response:
8181
try:
8282
url = self.get_abs_url(endpoint)
8383
response = self._http_session.delete(url, **kwargs)
84+
85+
self._raise_on_errors(response, url=url)
86+
return response
8487
except requests.RequestException as request_exception:
8588
self._translate_exception(request_exception, url=url)
8689

87-
self._raise_on_errors(response, url=url)
88-
return response
89-
9090
def close(self):
9191
self._http_session.close()
9292

release-notes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
- #7: fix wrong exception handling
3+
14
v 0.18.4
25
========
36

0 commit comments

Comments
 (0)