up to SparselyBin with reduced tests

Author: jpivarski

histogrammar/primitives/bag.py

@@ -318,6 +318,9 @@ def __eq__(self, other):
                     if isinstance(v1i, numbers.Real) and isinstance(v2i, numbers.Real):
                         if not numeq(v1i, v2i):
                             return False
+                    elif isinstance(v1i, basestring) and isinstance(v2i, basestring):
+                        if v1i != v2i:
+                            return False
                     else:
                         return False
             else:

histogrammar/util.py

@@ -140,7 +140,9 @@ def floatOrNan(x):
 
 def floatToJson(x):
     """Custom rule for converting non-finite numbers to JSON as quoted strings: ``"inf"``, ``"-inf"``, and ``"nan"``. This avoids Python's bad habit of putting literal ``Infinity``, ``-Infinity``, and ``NaN`` in the JSON (without quotes)."""
-    if math.isnan(x):
+    if x in ("nan", "inf", "-inf"):
+        return x
+    elif math.isnan(x):
         return "nan"
     elif math.isinf(x) and x > 0.0:
         return "inf"
@@ -222,9 +224,10 @@ def function(datum):
                     # fill the namespace with math.* functions
                     context.update(math.__dict__)
 
-                    # if you have Numpy, override the namespace with numpy.* functions
+                    # if you have Numpy, include numpy.* functions
                     if numpy is not None:
-                        context.update(numpy.__dict__)
+                        context["numpy"] = numpy
+                        context["np"] = numpy
 
                     # if the datum is a dict, override the namespace with its dict keys
                     if isinstance(datum, dict):                # if it's a dict