Moved heapsort to templates, updated imports.

Author: Dan

influxgraph/templates.py

@@ -19,8 +19,8 @@
 import re
 import logging
 from collections import deque
+from heapq import heappush, heappop
 
-from .utils import heapsort
 from .constants import GRAPHITE_PATH_REGEX_PATTERN
 from .classes.tree import NodeTreeIndex
 
@@ -32,6 +32,13 @@ class InvalidTemplateError(Exception):
     pass
 
 
+# Function as per Python official documentation
+def heapsort(iterable):
+    h = []
+    for value in iterable:
+        heappush(h, value)
+    return [heappop(h) for _ in range(len(h))]
+
 def parse_influxdb_graphite_templates(templates, separator='.'):
     """Parse InfluxDB template configuration and return parsed templates
 

influxgraph/utils.py

@@ -20,14 +20,13 @@
 import sys
 import re
 import hashlib
-from heapq import heappush, heappop
 
 from .constants import INFLUXDB_AGGREGATIONS
 try:
     from .ext.classes.tree import NodeTreeIndex
     from .ext.templates import get_series_with_tags
 except ImportError:
-    from .tree import NodeTreeIndex
+    from .classes.tree import NodeTreeIndex
     from .templates import get_series_with_tags
 
 def calculate_interval(start_time, end_time, deltas=None):
@@ -196,13 +195,6 @@ def gen_memcache_key(start_time, end_time, aggregation_func, paths):
     key_prefix = hashlib.md5("".join(paths).encode('utf8')).hexdigest()
     return "".join([key_prefix, aggregation_func, str(delta)]).encode('utf8')
 
-# Function as per Python official documentation
-def heapsort(iterable):
-    h = []
-    for value in iterable:
-        heappush(h, value)
-    return [heappop(h) for _ in range(len(h))]
-
 def parse_series(series, fields, graphite_templates, separator='.'):
     """Parses series and fields with/without graphite templates
     and returns built Index