clear-skies 1.22.16__py3-none-any.whl → 1.22.17__py3-none-any.whl

{clear_skies-1.22.16.dist-info → clear_skies-1.22.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.22.16
+Version: 1.22.17
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.22.16.dist-info → clear_skies-1.22.17.dist-info}/RECORD

@@ -159,7 +159,7 @@ clearskies/handlers/simple_search.py,sha256=bSfq8rzdqkBj-dTGUBSZ1EkfjzUWHID7mKD2
 clearskies/handlers/update.py,sha256=rx8HW87Pfh95e_9nEfKKnxfkh2HBlCUdYqVwljtXiJ8,4116
 clearskies/handlers/write.py,sha256=Gu1w1PQ1F7tlqCqALorMRek3UH6IkViPIO195dxPd8k,9372
 clearskies/input_outputs/__init__.py,sha256=mQWL-u41FRTrPGuHe8FhLmcHjAEaUxjFwUf7RgDcbAs,182
-clearskies/input_outputs/cli.py,sha256=DCoSHn2fd7cwi4-3eZU_M0-Txk85PQNB1x6D_B50f1M,6529
+clearskies/input_outputs/cli.py,sha256=ar2TeW-24BdCRbw9JFilZyJlZ2Qg34uwluutKx1XKSA,6694
 clearskies/input_outputs/exceptions/__init__.py,sha256=bc5Tc1XBZnqA1fKbk7pk5hyx102vqx3sDE19E03xGk4,82
 clearskies/input_outputs/exceptions/cli_input_error.py,sha256=kOFU8aLTLmeTL_AKDshxMu8_ufildg6p8ndhE1xHfb0,41
 clearskies/input_outputs/exceptions/cli_not_found.py,sha256=JBBuZA9ZwdkPhd3a0qaGgEPQrxh1fehy4R3ZaV2gWXU,39
@@ -207,7 +207,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.22.16.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.22.16.dist-info/METADATA,sha256=CxzPQbb-JBnBFmMTlnk9Q_tX1u3uuXiJgvy2TCbi9BU,1920
-clear_skies-1.22.16.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-clear_skies-1.22.16.dist-info/RECORD,,
+clear_skies-1.22.17.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.22.17.dist-info/METADATA,sha256=FrDzoVin5njD_n8BwJSkfIE2za9cKltGlgiaf5rMv8s,1920
+clear_skies-1.22.17.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+clear_skies-1.22.17.dist-info/RECORD,,

clearskies/input_outputs/cli.py

@@ -79,10 +79,10 @@ class CLI:
     def get_request_method(self):
         return self._request_method if self._request_method else "GET"
 
-    def request_data(self, required=True):
-        request_data = self.json_body(False)
+    def request_data(self, required=True, allow_non_json_bodies=False):
+        request_data = self.json_body(False, allow_non_json_bodies=allow_non_json_bodies)
         if not request_data:
-            if self.has_body():
+            if self.has_body() and not allow_non_json_bodies:
                 raise ClientError("Request body was not valid JSON")
             request_data = {}
         return request_data
@@ -126,7 +126,7 @@ class CLI:
             # in the _get_json_body method
         return self._cached_body
 
-    def json_body(self, required=True):
+    def json_body(self, required=True, allow_non_json_bodies=False):
         json = self._get_json_body()
         # if we get None then either the body was not JSON or was empty.
         # If it is required then we have an exception either way.  If it is not required
@@ -134,7 +134,7 @@ class CLI:
         # if json is None and there is an actual request body.  If json is none, the body is empty,
         # and it was not required, then we can just return None
         if json is None:
-            if required or self.has_body():
+            if required or (self.has_body() and not allow_non_json_bodies):
                 raise ClientError("Request body was not valid JSON")
         return json