Fix JSON decoding in AlgodHTTPError

algosdk/v2client/algod.py

@@ -75,8 +75,8 @@ def algod_request(self, method, requrl, params=None, data=None,
             code = e.code
             e = e.read().decode("utf-8")
             try:
-                raise error.AlgodHTTPError(json.loads(e)["message"], code)
-            except:
+                e = json.loads(e)["message"]
+            finally:
                 raise error.AlgodHTTPError(e, code)
         if response_format == "json":
             try:

algosdk/v2client/indexer.py

@@ -72,8 +72,8 @@ def indexer_request(self, method, requrl, params=None, data=None,
         except urllib.error.HTTPError as e:
             e = e.read().decode("utf-8")
             try:
-                raise error.IndexerHTTPError(json.loads(e)["message"])
-            except:
+                e = json.loads(e)["message"]
+            finally:
                 raise error.IndexerHTTPError(e)
         response_dict = json.loads(resp.read().decode("utf-8"))
 

test/steps/v2_steps.py

@@ -77,7 +77,7 @@ def step_impl(context, filename, directory, status):
 def validate_error(context, err):
     if context.expected_status_code != 200:
         if context.expected_status_code == 500:
-            assert context.expected_mock_response == json.loads(err.args[0])
+            assert context.expected_mock_response['message'] == err.args[0], (context.expected_mock_response, err.args[0])
         else:
             raise NotImplementedError("test does not know how to validate status code " + context.expected_status_code)
     else:

test_integration.py

@@ -486,6 +486,7 @@ def test_transaction_group(self):
             send = self.acl.send_transactions([stxn1])
             self.assertEqual(send, txn.get_txid())
         except error.AlgodHTTPError as ex:
+            self.assertNotIn('{"message"', str(ex))
             self.assertIn(
                 "TransactionPool.Remember: transaction groups not supported",
                 str(ex))