From d7518ee2379b22eb80e4df6a5ce9196234e8a915 Mon Sep 17 00:00:00 2001 From: Johann Schmitz Date: Sat, 8 Apr 2017 05:54:23 +0200 Subject: [PATCH] Don't fail if there are None values in the list --- djunin/graphs.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/djunin/graphs.py b/djunin/graphs.py index 1470b87..66b1da4 100644 --- a/djunin/graphs.py +++ b/djunin/graphs.py @@ -21,6 +21,13 @@ SCOPE_YEAR = 4 SCOPE_RANGE = 5 +def max_not_none(iter, default=None): + if iter is None: + return default + items = [x for x in iter if x is not None] + return max(items) if items else default + + class GraphDataGenerator(object): def __init__(self, node, graph, scope_name, range_start=None, range_end=None): self.data_scope_name = scope_name @@ -147,7 +154,7 @@ class D3GraphDataGenerator(GraphDataGenerator): @property def y_max(self): if self._y_max is None: - self._y_max = max([max(v.values()) for _, v in self.graph_data]) + self._y_max = max_not_none([max_not_none(v.values()) for _, v in self.graph_data]) return self._y_max @property