Merge 7d37b41c54 into bad91d661e

test/functional/test_framework/script.py

@@ -462,7 +462,7 @@ class CScript(bytes):
         raise NotImplementedError
 
     def __new__(cls, value=b''):
-        if isinstance(value, bytes) or isinstance(value, bytearray):
+        if isinstance(value, (bytes, bytearray)):
             return super().__new__(cls, value)
         else:
             def coerce_iterable(iterable):

test/functional/test_framework/script_util.py

@@ -78,6 +78,6 @@ def check_key(key):
 def check_script(script):
     if isinstance(script, str):
         script = hex_str_to_bytes(script) # Assuming this is hex string
-    if isinstance(script, bytes) or isinstance(script, CScript):
+    if isinstance(script, (bytes, CScript)):
         return script
     assert False

test/functional/test_framework/test_node.py

@@ -571,7 +571,7 @@ def arg_to_cli(arg):
         return str(arg).lower()
     elif arg is None:
         return 'null'
-    elif isinstance(arg, dict) or isinstance(arg, list):
+    elif isinstance(arg, (dict, list)):
         return json.dumps(arg, default=EncodeDecimal)
     else:
         return str(arg)