v2.0.11: improve delete return handling (fixes #12)

Author: gabrielburnworth

farmbot/functions/api.py

@@ -186,7 +186,12 @@ def request(self, method, endpoint, database_id, payload=None):
             self.state.error = None
             description = "Successfully fetched request contents."
             self.state.print_status(description=description)
-            return response.json()
+            try:
+                result = response.json()
+            except (json.JSONDecodeError, requests.exceptions.RequestException):
+                result = self.parse_text(response.text)
+            return result
+
         description = "There was an error processing the request..."
         self.state.print_status(description=description)
         return self.state.error

farmbot/main.py

@@ -15,7 +15,7 @@
 from .functions.resources import Resources
 from .functions.tools import ToolControls
 
-VERSION = "2.0.10"
+VERSION = "2.0.11"
 
 
 class Farmbot():

tests/tests_main.py

@@ -439,6 +439,23 @@ def test_api_delete(self, mock_request):
         )
         self.assertEqual(result, {'name': 'deleted'})
 
+    @patch('requests.request')
+    def test_api_delete_empty_text_return_value(self, mock_request):
+        '''test api_delete function with empty_text return value'''
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.text = ''
+        mock_response.json.side_effect = json.JSONDecodeError(
+            'error', doc='', pos=0)
+        mock_request.return_value = mock_response
+        result = self.fb.api_delete('points', 12345)
+        mock_request.assert_called_once_with(
+            method='DELETE',
+            url='https://my.farm.bot/api/points/12345',
+            **REQUEST_KWARGS,
+        )
+        self.assertEqual(result, '')
+
     @patch('requests.request')
     def test_api_delete_with_payload(self, mock_request):
         '''test api_delete: with payload'''