lsrestclient 3.0.0__py3-none-any.whl → 3.0.2__py3-none-any.whl

lsrestclient/exceptions.py

@@ -54,20 +54,20 @@ def raise_errors(r, exceptions: Optional[List[Type[Exception]]] = None):
     else:
         try:
             json = r.json()
-            detail = pydash.get(json, "detail", json)
-            error_class = pydash.get(detail, "error_class", None)
-            if error_class is not None:
-                payload = pydash.get(detail, "error_payload", {})
-            else:
-                error_class = pydash.get(detail, "ERROR_CLASS", None)
-                payload = {}
-
-            if error_class in exceptions_by_class:
-                e = exceptions_by_class[error_class](**payload)
-                raise e
-            # backend errors
-            raise WebException(status_code=r.status_code, detail=detail)
-
         except Exception as e:
             log.error(r.content)
             raise WebException(status_code=r.status_code, detail=r.content)
+
+        detail = pydash.get(json, "detail", json)
+        error_class = pydash.get(detail, "error_class", None)
+        if error_class is not None:
+            payload = pydash.get(detail, "error_payload", {})
+        else:
+            error_class = pydash.get(detail, "ERROR_CLASS", None)
+            payload = {}
+
+        if error_class in exceptions_by_class:
+            e = exceptions_by_class[error_class](**payload)
+            raise e
+        # backend errors
+        raise WebException(status_code=r.status_code, detail=detail)

lsrestclient/response.py

@@ -6,6 +6,7 @@ import pydash
 from requests import Response
 from requests.structures import CaseInsensitiveDict
 
+
 @dataclass
 class LsRestClientResponse:
     """
@@ -19,7 +20,7 @@ class LsRestClientResponse:
     _json: Optional[dict] = None
 
     def json(self):
-        if self._json is None:
+        if self._json is None and self.content != "":
             self._json = lsjsonclasses.LSoftJSONDecoder.loads(self.content)
         return self._json
 
@@ -37,7 +38,7 @@ class LsRestClientResponse:
         encoding = pydash.get(response, "encoding", None)
         headers = pydash.get(response, "headers", None)
         content_type = headers.get("Content-Type", None)
-        if content_type == 'application/pdf':
+        if content_type == "application/pdf":
             content = response.content
         else:
             content = response.content.decode("utf8" if encoding is None else encoding)

{lsrestclient-3.0.0.dist-info → lsrestclient-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsrestclient
-Version: 3.0.0
+Version: 3.0.2
 Summary: REST Api Client
 Author: mba
 Author-email: bartel@electronic-shop.lu

{lsrestclient-3.0.0.dist-info → lsrestclient-3.0.2.dist-info}/RECORD

@@ -3,11 +3,11 @@ lsrestclient/auth.py,sha256=IC6niEht-xB_wC7da0HIeM05Ha785qhls-Q39P6dMHQ,467
 lsrestclient/client.py,sha256=JWhf9foS-2RC0_LZz-DoXD6CE7T-o2J-DuAtDE6aaXc,11336
 lsrestclient/contexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsrestclient/contexts/bearer_token.py,sha256=GZZOzAI2Ng_9DvFCbhv1Wwb8wJ1AYCca3fQeNtt2NaU,753
-lsrestclient/exceptions.py,sha256=IkIk9bLUHv_Ds9oJ24fbdpdP2nnoUQM5RGX25hzQSdI,2197
+lsrestclient/exceptions.py,sha256=exJd1BfygNkkAqekmWepVXvXlMiOInVzPRnq7TmPURs,2149
 lsrestclient/fixtures.py,sha256=dFkAYQXL6xqTOwRofb03Nsu_cIjq1sG10Rh8dxWfz9s,239
 lsrestclient/mock.py,sha256=Ya12F0t5sXHTSt-X4jDDj5ILJx6y6QaBAMXutQMsIRI,1376
-lsrestclient/response.py,sha256=zVisLH4TMG5Ww9gseLSb1rVpHUESoR03DNpL0bv1GCU,2165
-lsrestclient-3.0.0.dist-info/METADATA,sha256=L7gKNYubzsDSOq_gnfiJev1XudOf2caTOxoWofcbDlE,6748
-lsrestclient-3.0.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-lsrestclient-3.0.0.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
-lsrestclient-3.0.0.dist-info/RECORD,,
+lsrestclient/response.py,sha256=8ovVmVB8gLW3U1EkewdQlPdFYP-YLoOpIH3ATVQc3wc,2189
+lsrestclient-3.0.2.dist-info/METADATA,sha256=W3mzdeZFyyBiKuw61phWZxZpgZ05SjdyD2ouyKDzppE,6748
+lsrestclient-3.0.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+lsrestclient-3.0.2.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
+lsrestclient-3.0.2.dist-info/RECORD,,