Rename CScript*Exception to Error

petertodd · petertodd · commit 435bb7651337 · 2014-02-22T04:30:10.000-05:00
diff --git a/bitcoin/core/script.py b/bitcoin/core/script.py
@@ -594,13 +594,13 @@ def __new__(cls, n):
     'OP_PUBKEY' : OP_PUBKEY,
 }
 
-class CScriptInvalidException(Exception):
+class CScriptInvalidError(Exception):
     pass
 
-class CScriptTruncatedPushDataException(CScriptInvalidException):
+class CScriptTruncatedPushDataError(CScriptInvalidError):
     def __init__(self, msg, data):
         self.data = data
-        super(CScriptTruncatedPushDataException, self).__init__(msg)
+        super(CScriptTruncatedPushDataError, self).__init__(msg)
 
 class CScript(bytes):
     @classmethod
@@ -662,21 +662,21 @@ def raw_iter(self):
                 elif opcode == OP_PUSHDATA1:
                     pushdata_type = 'PUSHDATA1'
                     if i >= len(self):
-                        raise CScriptInvalidException('PUSHDATA1: missing data length')
+                        raise CScriptInvalidError('PUSHDATA1: missing data length')
                     datasize = bord(self[i])
                     i += 1
 
                 elif opcode == OP_PUSHDATA2:
                     pushdata_type = 'PUSHDATA2'
                     if i + 1 >= len(self):
-                        raise CScriptInvalidException('PUSHDATA2: missing data length')
+                        raise CScriptInvalidError('PUSHDATA2: missing data length')
                     datasize = bord(self[i]) + (bord(self[i+1]) << 8)
                     i += 2
 
                 elif opcode == OP_PUSHDATA4:
                     pushdata_type = 'PUSHDATA4'
                     if i + 3 >= len(self):
-                        raise CScriptInvalidException('PUSHDATA4: missing data length')
+                        raise CScriptInvalidError('PUSHDATA4: missing data length')
                     datasize = bord(self[i]) + (bord(self[i+1]) << 8) + (bord(self[i+2]) << 16) + (bord(self[i+3]) << 24)
                     i += 4
 
@@ -688,7 +688,7 @@ def raw_iter(self):
 
                 # Check for truncation
                 if len(data) < datasize:
-                    raise CScriptTruncatedPushDataException('%s: truncated data' % pushdata_type, data)
+                    raise CScriptTruncatedPushDataError('%s: truncated data' % pushdata_type, data)
 
                 i += datasize
 
@@ -721,10 +721,10 @@ def _repr(o):
             op = None
             try:
                 op = _repr(next(i))
-            except CScriptTruncatedPushDataException as err:
+            except CScriptTruncatedPushDataError as err:
                 op = '%s...<ERROR: %s>' % (_repr(err.data), err)
                 break
-            except CScriptInvalidException as err:
+            except CScriptInvalidError as err:
                 op = '<ERROR: %s>' % err
                 break
             except StopIteration:
@@ -760,7 +760,7 @@ def is_valid(self):
         """
         try:
             list(self)
-        except CScriptInvalidException:
+        except CScriptInvalidError:
             return False
         return True
 
diff --git a/bitcoin/core/scripteval.py b/bitcoin/core/scripteval.py
@@ -599,7 +599,7 @@ def check_args(n):
 def EvalScript(stack, scriptIn, txTo, inIdx, hashtype, flags=()):
     try:
         return _EvalScript(stack, scriptIn, txTo, inIdx, hashtype, flags=flags)
-    except CScriptInvalidException:
+    except CScriptInvalidError:
         return False
     except EvalScriptError:
         return False
diff --git a/bitcoin/tests/test_script.py b/bitcoin/tests/test_script.py
@@ -135,7 +135,7 @@ def T(serialized_script, expected_tokens, test_roundtrip=True):
 
     def test_invalid_scripts(self):
         def T(serialized):
-            with self.assertRaises(CScriptInvalidException):
+            with self.assertRaises(CScriptInvalidError):
                 list(CScript(unhexlify(serialized)))
 
         T(b'01')
