Merge branch 'float_fix' into develop

PR #281

* float_fix:
  Add additional compliance tests for verifying float/boolean correctness
  Add support for proper bool/float comparison

Author: jamesls

jmespath/visitor.py

@@ -6,13 +6,13 @@
 
 
 def _equals(x, y):
-    if _is_special_integer_case(x, y):
+    if _is_special_number_case(x, y):
         return False
     else:
         return x == y
 
 
-def _is_special_integer_case(x, y):
+def _is_special_number_case(x, y):
     # We need to special case comparing 0 or 1 to
     # True/False.  While normally comparing any
     # integer other than 0/1 to True/False will always
@@ -29,23 +29,11 @@ def _is_special_integer_case(x, y):
     # Also need to consider that:
     # >>> 0 in [True, False]
     # True
-    if _is_boolean_int(x):
+    if _is_actual_number(x) and x in (0, 1):
         return isinstance(y, bool)
-    elif _is_boolean_int(y):
+    elif _is_actual_number(y) and y in (0, 1):
         return isinstance(x, bool)
 
-def _is_boolean_int(num):
-    """
-    For backwards compatibility, Python considers bool to be an int.
-    This causes issues when doing type comparison with isinstance(x, int).
-    This function ensures the value is an actual int respresenting a boolean.
-    """
-    return (
-        not isinstance(num, bool)
-        and isinstance(num, int)
-        and num in (0, 1)
-    )
-
 
 def _is_comparable(x):
     # The spec doesn't officially support string types yet,
@@ -63,7 +51,7 @@ def _is_actual_number(x):
     # True
     # >>> isinstance(True, int)
     # True
-    if x is True or x is False:
+    if isinstance(x, bool):
         return False
     return isinstance(x, Number)
 
@@ -269,7 +257,7 @@ def visit_and_expression(self, node, value):
 
     def visit_not_expression(self, node, value):
         original_result = self.visit(node['children'][0], value)
-        if type(original_result) is int and original_result == 0:
+        if _is_actual_number(original_result) and original_result == 0:
             # Special case for 0, !0 should be false, not true.
             # 0 is not a special cased integer in jmespath.
             return False

tests/compliance/boolean.json

@@ -76,7 +76,8 @@
       "False": false,
       "Number": 5,
       "EmptyList": [],
-      "Zero": 0
+      "Zero": 0,
+      "ZeroFloat": 0.0
     },
     "cases": [
       {
@@ -198,6 +199,14 @@
       {
         "expression": "!!Zero",
         "result": true
+      },
+      {
+        "expression": "Zero || Number",
+        "result": 0
+      },
+      {
+        "expression": "ZeroFloat || Number",
+        "result": 0.0
       }
     ]
   },

tests/compliance/filters.json

@@ -265,6 +265,88 @@
       }
     ]
   },
+  {
+    "given": {"foo": [
+      {"key": true},
+      {"key": false},
+      {"key": 0},
+      {"key": 0.0},
+      {"key": 1},
+      {"key": 1.0},
+      {"key": [0]},
+      {"key": null},
+      {"key": [1]},
+      {"key": []},
+      {"key": {}},
+      {"key": {"a":2}}
+    ]},
+    "cases": [
+      {
+        "expression": "foo[?key == `true`]",
+        "result": [{"key": true}]
+      },
+      {
+        "expression": "foo[?key == `false`]",
+        "result": [{"key": false}]
+      },
+      {
+        "expression": "foo[?key]",
+        "result": [
+          {"key": true},
+          {"key": 0},
+          {"key": 0.0},
+          {"key": 1},
+          {"key": 1.0},
+          {"key": [0]},
+          {"key": [1]},
+          {"key": {"a": 2}}
+        ]
+      },
+      {
+        "expression": "foo[? !key]",
+        "result": [
+          {"key": false},
+          {"key": null},
+          {"key": []},
+          {"key": {}}
+        ]
+      },
+      {
+        "expression": "foo[? !!key]",
+        "result": [
+          {"key": true},
+          {"key": 0},
+          {"key": 0.0},
+          {"key": 1},
+          {"key": 1.0},
+          {"key": [0]},
+          {"key": [1]},
+          {"key": {"a": 2}}
+        ]
+      },
+      {
+        "expression": "foo[? `true`]",
+        "result": [
+          {"key": true},
+          {"key": false},
+          {"key": 0},
+          {"key": 0.0},
+          {"key": 1},
+          {"key": 1.0},
+          {"key": [0]},
+          {"key": null},
+          {"key": [1]},
+          {"key": []},
+          {"key": {}},
+          {"key": {"a":2}}
+        ]
+      },
+      {
+        "expression": "foo[? `false`]",
+        "result": []
+      }
+    ]
+  },
   {
     "given": {"reservations": [
       {"instances": [