move ValueError to sciter.value module

Author: pravic

sciter/__init__.py

@@ -7,7 +7,7 @@
 from .window import Window
 from .dom import Element
 from .event import EventHandler
-from .error import SciterError, ScriptError, ScriptException, ValueError
+from .error import SciterError, ScriptError, ScriptException
 
 sapi = api = SciterAPI()
 gapi = sapi.GetSciterGraphicsAPI if sapi else None

sciter/error.py

@@ -6,25 +6,6 @@ class SciterError(Exception):
     pass
 
 
-class ArgumentError(SciterError):
-    """."""
-    def __init__(self, message, script=None):
-        super().__init__(message)
-        self.message = message
-        self.script = script
-    pass
-
-
-class ValueError(ArgumentError):
-    """."""
-    def __init__(self, hv_code, script=None):
-        msg = "Incompatible type" if hv_code == 2 else "Bad parameter"
-        if script:
-            msg = msg + " at " + script
-        super().__init__(msg, script)
-    pass
-
-
 class ScriptError(SciterError):
     """Raised by runtime from calling script when script error occured (e.g. bad syntax)."""
     def __init__(self, message, script=None):

sciter/value.py

@@ -4,6 +4,7 @@
 import ctypes
 
 import sciter
+import sciter.error
 import sciter.capi.scdef
 import sciter.capi.sctypes
 
@@ -37,6 +38,20 @@ def _subtype_name(subtype):
                    }
 
 
+# TODO: Rename it.
+class ValueError(sciter.error.SciterError):
+    """Raised by sciter.Value operations."""
+
+    def __init__(self, hv_code, script=None):
+        """."""
+        msg = "Incompatible type" if hv_code == 2 else "Bad parameter"
+        if script:
+            msg = msg + " at " + script
+        super().__init__(msg)
+    pass
+
+
+# sciter.value
 class value():
     """sciter::value pythonic wrapper."""
 
@@ -48,7 +63,7 @@ def parse(cls, json: str, how=VALUE_STRING_CVT_TYPE.CVT_JSON_LITERAL, throw=True
         rv = value()
         ok = _api.ValueFromString(rv, json, len(json), how)
         if ok != 0 and throw:
-            raise sciter.ValueError(VALUE_RESULT.HV_BAD_PARAMETER, "value.parse")
+            raise sciter.value.ValueError(VALUE_RESULT.HV_BAD_PARAMETER, "value.parse")
         return rv
 
     @classmethod
@@ -538,7 +553,7 @@ def _throw_if(code):
             return
         import inspect
         context = inspect.stack()[1][3]
-        raise sciter.ValueError(code, "value." + context)
+        raise sciter.value.ValueError(code, "value." + context)
 
     # utility methods
     @staticmethod

tests/test_value.py

@@ -145,7 +145,7 @@ def test_13parse(self):
                     self.assertTrue(xval)
                 else:
                     self.assertFalse(xval)
-        with self.assertRaises(sciter.ValueError):
+        with self.assertRaises(sciter.value.ValueError):
             item = '{item: '
             xval = value.parse(item)
         pass
@@ -246,7 +246,7 @@ def test_19explicit(self):
         self.assertEqual(xval.get_value(), 'secure')
 
         # error
-        xval = value(ValueError('error'))
+        xval = value(TypeError('error'))
         self.assertTrue(xval.is_error_string())
         self.assertEqual(xval.get_value(), 'error')  # doesn't raise exception.