Merge pull request #36 from histogrammar/1.0.x

1.0.x

Author: mbaak

README.md

@@ -7,7 +7,7 @@ See [histogrammar.org](http://histogrammar.org) for a complete introduction to H
 
 This is a pure Python implementation for Python versions 2.7, and 3.4, 3.5, 3.6, 3.7
 
-Latest Python release: v1.0.10 (Sep 2019).
+Latest Python release: v1.0.11 (Nov 2019).
 
 Support of Histogrammar is provided on a best-effort basis only.
 

docs/conf.py

@@ -47,9 +47,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "1.0.10"
+version = "1.0.11"
 # The full version, including alpha/beta/rc tags.
-release = "1.0.10"
+release = "1.0.11"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

histogrammar/primitives/categorize.py

@@ -81,6 +81,8 @@ def __init__(self, quantity, value=Count()):
         self.bins = {}
         if value is not None:
             self.contentType = value.name
+        else:
+            self.contentType = "Count"
         super(Categorize, self).__init__()
         self.specialize()
 
@@ -286,11 +288,18 @@ def toJsonFragment(self, suppressName):
         else:
             binsName = None
 
+        if len(self.bins) > 0:
+            bins_type = list(self.bins.values())[0].name
+        elif self.value is not None:
+            bins_type = self.value.name
+        else:
+            bins_type = self.contentType
+
         return maybeAdd({
             # for json serialization all keys need to be strings, else json libs throws TypeError
             # e.g. boolean keys get converted to strings here
             "entries": floatToJson(self.entries),
-            "bins:type": self.value.name if self.value is not None else self.contentType,
+            "bins:type": bins_type,
             "bins": dict((str(k), v.toJsonFragment(True)) for k, v in self.bins.items()),
             }, **{"name": None if suppressName else self.quantity.name,
                   "bins:name": binsName})

histogrammar/primitives/sparselybin.py

@@ -106,6 +106,8 @@ def __init__(self, binWidth, quantity, value=Count(), nanflow=Count(), origin=0.
         self.value = value
         if value is not None:
             self.contentType = value.name
+        else:
+            self.contentType = "Count"
         self.bins = {}
         self.nanflow = nanflow.copy()
         self.origin = origin
@@ -424,10 +426,17 @@ def toJsonFragment(self, suppressName):
         else:
             binsName = None
 
+        if len(self.bins) > 0:
+            bins_type = list(self.bins.values())[0].name
+        elif self.value is not None:
+            bins_type = self.value.name
+        else:
+            bins_type = self.contentType
+
         return maybeAdd({
             "binWidth": floatToJson(self.binWidth),
             "entries": floatToJson(self.entries),
-            "bins:type": self.value.name if self.value is not None else self.contentType,
+            "bins:type": bins_type,
             "bins": dict((str(i), v.toJsonFragment(True)) for i, v in self.bins.items()),
             "nanflow:type": self.nanflow.name,
             "nanflow": self.nanflow.toJsonFragment(False),