Supports invalid-value error type

Author: springcomp

jmespath/exceptions.py

@@ -114,18 +114,16 @@ def __str__(self):
 
 @with_str_method
 class JMESPathValueError(JMESPathError):
-    def __init__(self, function_name, current_value, actual_value,
-                 expected_types):
+    def __init__(self, function_name, current_value, expected_types):
         self.function_name = function_name
         self.current_value = current_value
-        self.actual_value = actual_value
         self.expected_types = expected_types
 
     def __str__(self):
-        return ('In function %s(), invalid value: %s, '
-                'expected: %s, received: "%s"' % (
+        return ('In function %s(), invalid value: "%s", '
+                'expected: %s"%s"' % (
                     self.function_name, self.current_value,
-                    self.expected_types, self.actual_value))
+                    self.expected_types))
 
 class EmptyExpressionError(JMESPathError):
     def __init__(self):

jmespath/functions.py

@@ -314,8 +314,8 @@ def _func_keys(self, arg):
         {'type': 'number', 'optional': True},
         {'type': 'number', 'optional': True})
     def _func_find_first(self, text, search, start = 0, end = None):
-        self._ensure_integer('find_first', start, start)
-        self._ensure_integer('find_first', end, end)
+        self._ensure_integer('find_first', 'start', start)
+        self._ensure_integer('find_first', 'end', end)
         return self._find_impl(
             text,
             search,
@@ -330,8 +330,8 @@ def _func_find_first(self, text, search, start = 0, end = None):
         {'type': 'number', 'optional': True},
         {'type': 'number', 'optional': True})
     def _func_find_last(self, text, search, start = 0, end = None):
-        self._ensure_integer('find_last', start, start)
-        self._ensure_integer('find_last', end, end)
+        self._ensure_integer('find_last', 'start', start)
+        self._ensure_integer('find_last', 'end', end)
         return self._find_impl(
             text,
             search,
@@ -367,7 +367,7 @@ def _func_pad_left(self, text, width, padding = ' '):
         {'type': 'number'},
         {'type': 'string', 'optional': True})
     def _func_pad_right(self, text, width, padding = ' '):
-        self._ensure_non_negative_integer('pad_left', 'width', width)
+        self._ensure_non_negative_integer('pad_right', 'width', width)
         return self._pad_impl(lambda : text.ljust(width, padding), padding)
 
     def _pad_impl(self, func, padding):
@@ -424,14 +424,10 @@ def _ensure_integer(
 
         if param_value != None: 
             if int(param_value) != param_value:
-                raise exceptions.JMESPathError(
-                    'invalid-type: {}() expects ${} to be a '
-                    'integer, but received {} instead.'
-                    .format(
-                        func_name,
-                        param_name,
-                        param_value
-                    ))
+                raise exceptions.JMESPathValueError(
+                    func_name,
+                    param_value,
+                    "integer")
 
     def _ensure_non_negative_integer(
         self,
@@ -441,14 +437,10 @@ def _ensure_non_negative_integer(
 
         if param_value != None: 
             if int(param_value) != param_value or int(param_value) < 0:
-                raise exceptions.JMESPathError(
-                    'invalid-type: {}() expects ${} to be a '
-                    'non-negative integer, but received {} instead.'
-                    .format(
-                        func_name,
-                        param_name,
-                        param_value
-                    ))
+                raise exceptions.JMESPathValueError(
+                    func_name,
+                    param_name,
+                    "non-negative integer")
 
     @signature({'type': 'string'}, {'type': 'string', 'optional': True})
     def _func_trim(self, text, chars = None):

tests/compliance/string_functions.json

@@ -28,7 +28,7 @@
       },
       {
         "expression": "find_first(string, 'string', `1`, '2.4')",
-        "error": "invalid-type"
+        "error": "invalid-value"
       },
 
       { "expression": "find_first(string, 'string')", "result": 8 },
@@ -60,12 +60,12 @@
 
       {
         "expression": "replace(abab, 'aa', '-', `0.333333`)",
-        "error": "invalid-type"
+        "error": "invalid-value"
       },
 
       {
         "expression": "replace(abab, 'aa', '-', `0.001`)",
-        "error": "invalid-type"
+        "error": "invalid-value"
       },
 
       { "expression": "replace(abab, 'aa', '-', `0`)", "result": "aabaaabaaaab" },
@@ -110,8 +110,8 @@
 
       },
       {
-        "expression": "pad_left('string', '1.4')",
-        "error": "invalid-type"
+        "expression": "pad_left('string', `1.4`)",
+        "error": "invalid-value"
 
       },
 
@@ -127,7 +127,7 @@
 
       {
         "expression": "split('/', '/', `3.7`)",
-        "error": "invalid-type"
+        "error": "invalid-value"
       },
 
       { "expression": "split('/', '/')", "result": [ "", "" ] },