Merge branch 'gmega-develop' into develop

PR #145

* gmega-develop:
  bugfix: reverse type of null should be NoneType, not None

Author: jamesls

jmespath/functions.py

@@ -28,7 +28,7 @@
     'boolean': ('bool',),
     'array': ('list', '_Projection'),
     'object': ('dict', 'OrderedDict',),
-    'null': ('None',),
+    'null': ('NoneType',),
     'string': ('unicode', 'str'),
     'number': ('float', 'int', 'long'),
     'expref': ('_Expression',),

tests/test_custom_functions.py

@@ -0,0 +1,25 @@
+import unittest
+
+import jmespath
+from jmespath import functions
+
+
+class CustomFunctions(functions.Functions):
+    @functions.signature({'types': ['string', 'array', 'object', 'null']})
+    def _func_length0(self, s):
+        return 0 if s is None else len(s)
+
+
+class TestCustomFunctions(unittest.TestCase):
+    def setUp(self):
+        self.options = jmespath.Options(custom_functions=CustomFunctions())
+
+    def test_null_to_nonetype(self):
+        data = {
+            'a': {
+                'b': [1, 2, 3]
+            }
+        }
+
+        self.assertEqual(jmespath.search('length0(a.b)', data, self.options), 3)
+        self.assertEqual(jmespath.search('length0(a.c)', data, self.options), 0)