Deduplicate error response parsing

ipfshttpclient/http_common.py

@@ -684,3 +684,34 @@ def download(
 		finally:
 			for closable in closables:
 				closable.close()
+
+	@staticmethod
+	def _raise_for_response_status(
+			error: Exception,
+			status_code: int,
+			content: ty.List[object]
+	) -> None:
+
+		"""
+		If we have decoded an error response from the server,
+		use that as the exception message; otherwise, just pass
+		the exception on to the caller.
+		"""
+
+		if len(content) == 1:
+			item = content[0]
+
+			if isinstance(item, dict) and "Message" in item:
+				msg: str = item["Message"]
+
+				raise exceptions.ErrorResponse(
+					status_code=status_code,
+					message=msg,
+					original=error
+				) from error
+
+		raise exceptions.StatusError(
+			status_code=status_code,
+			message=str(error),
+			original=error
+		) from error

ipfshttpclient/http_httpx.py

@@ -130,8 +130,8 @@ def _make_session(self) -> httpx.Client:
 		                    base_url  = self._session_base,
 		                    transport = connection_pool)
 
-	@staticmethod
-	def _do_raise_for_status(response: httpx.Response) -> None:
+	@classmethod
+	def _do_raise_for_status(cls, response: httpx.Response) -> None:
 		try:
 			response.raise_for_status()
 		except httpx.HTTPError as error:
@@ -143,26 +143,9 @@ def _do_raise_for_status(response: httpx.Response) -> None:
 				content += list(decoder.parse_finalize())
 			except exceptions.DecodingError:
 				pass
-
-			# If we have decoded an error response from the server,
-			# use that as the exception message; otherwise, just pass
-			# the exception on to the caller.
-			if len(content) == 1 \
-			   and isinstance(content[0], dict) \
-			   and "Message" in content[0]:
-				msg: str = content[0]["Message"]
-				raise exceptions.ErrorResponse(
-					status_code=response.status_code,
-					message=msg,
-					original=error
-				) from error
-			else:
-				raise exceptions.StatusError(
-					status_code=response.status_code,
-					message=str(error),
-					original=error
-				) from error
-
+
+			cls._raise_for_response_status(error, response.status_code, content)
+
 	def _request(
 			self, method: str, path: str, params: ty.Sequence[ty.Tuple[str, str]], *,
 			auth: auth_t,

ipfshttpclient/http_requests.py

@@ -118,8 +118,8 @@ def _make_session(self) -> requests.Session:  # type: ignore[name-defined]
 			session.close()
 			raise
 
-	@staticmethod
-	def _do_raise_for_status(response: requests.Response) -> None:  # type: ignore[name-defined]
+	@classmethod
+	def _do_raise_for_status(cls, response: requests.Response) -> None:  # type: ignore[name-defined]
 		try:
 			response.raise_for_status()
 		except requests.exceptions.HTTPError as error:  # type: ignore[attr-defined]
@@ -132,25 +132,8 @@ def _do_raise_for_status(response: requests.Response) -> None:  # type: ignore[n
 			except exceptions.DecodingError:
 				pass
 
-			# If we have decoded an error response from the server,
-			# use that as the exception message; otherwise, just pass
-			# the exception on to the caller.
-			if len(content) == 1 \
-			   and isinstance(content[0], dict) \
-			   and "Message" in content[0]:
-				msg: str = content[0]["Message"]
-				raise exceptions.ErrorResponse(
-					status_code=response.status_code,
-					message=msg,
-					original=error
-				) from error
-			else:
-				raise exceptions.StatusError(
-					status_code=response.status_code,
-					message=str(error),
-					original=error
-				) from error
-
+			cls._raise_for_response_status(error, response.status_code, content)
+
 	def _request(
 			self, method: str, path: str, params: ty.Sequence[ty.Tuple[str, str]], *,
 			auth: auth_t,

test/unit/test_http_common.py

@@ -0,0 +1,44 @@
+
+import pytest
+
+from ipfshttpclient.exceptions import ErrorResponse, StatusError
+from ipfshttpclient.http_common import ClientSyncBase
+
+
+def test_client_sync_base_raises_for_standardized_failure():
+	original = Exception('foo')
+
+	with pytest.raises(ErrorResponse) as failure:
+		ClientSyncBase._raise_for_response_status(
+			error=original,
+			status_code=405,
+			content=[
+				{
+					'Message': 'bar'
+				}
+			]
+		)
+
+	assert failure.value.status_code == 405
+	assert str(failure.value) == 'bar'
+	assert failure.value.original is original
+
+
+@pytest.mark.parametrize('content', [
+	[],
+	[{'wrong': 'ignored'}],
+	[{'Message': 'too'}, {'Message': 'many'}]
+])
+def test_client_sync_base_raises_for_non_standard_failure(content):
+	original = Exception('qux')
+
+	with pytest.raises(StatusError) as failure:
+		ClientSyncBase._raise_for_response_status(
+			error=original,
+			status_code=406,
+			content=content
+		)
+
+	assert failure.value.status_code == 406
+	assert str(failure.value) == 'qux'
+	assert failure.value.original is original