Merge branch 'develop' into feature/vnext-preview

Author: springcomp

bin/jp.py

@@ -42,6 +42,9 @@ def main():
     except exceptions.JMESPathTypeError as e:
         sys.stderr.write("invalid-type: %s\n" % e)
         return 1
+    except exceptions.JMESPathValueError as e:
+        sys.stderr.write("invalid-value: %s\n" % e)
+        return 1
     except exceptions.UnknownFunctionError as e:
         sys.stderr.write("unknown-function: %s\n" % e)
         return 1

jmespath/exceptions.py

@@ -112,6 +112,19 @@ def __str__(self):
                     self.expected_types, self.actual_type))
 
 
+@with_str_method
+class JMESPathValueError(JMESPathError):
+    def __init__(self, function_name, current_value, expected_types):
+        self.function_name = function_name
+        self.current_value = current_value
+        self.expected_types = expected_types
+
+    def __str__(self):
+        return ('In function %s(), invalid value: "%s", '
+                'expected: %s"%s"' % (
+                    self.function_name, self.current_value,
+                    self.expected_types))
+
 class EmptyExpressionError(JMESPathError):
     def __init__(self):
         super(EmptyExpressionError, self).__init__(

jmespath/functions.py

@@ -10,7 +10,6 @@
 from jmespath.compat import iteritems
 from jmespath.compat import map
 from jmespath.compat import string_type as STRING_TYPE
-from jmespath.compat import get_methods
 
 
 # python types -> jmespath types
@@ -336,8 +335,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,
@@ -352,8 +351,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,
@@ -389,7 +388,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):
@@ -446,14 +445,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,
@@ -463,14 +458,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):