Patch to replace syntax that's incompatible with Python 3.4

Unpacking a dictionary inside a dictionary display was only introduced in
PEP 448 in Python 3.5

prometheus_es_exporter/cluster_health_parser.py

@@ -1,3 +1,5 @@
+from .utils import merge_dicts
+
 singular_forms = {
     'indices': 'index',
     'shards': 'shard'
@@ -31,7 +33,7 @@ def parse_block(block, metric=[], labels={}):
             else:
                 singular_key = key
             for n_key, n_value in value.items():
-                result.extend(parse_block(n_value, metric=metric + [key], labels={**labels, singular_key: [n_key]}))
+                result.extend(parse_block(n_value, metric=metric + [key], labels=merge_dicts(labels, {singular_key: [n_key]})))
 
     return result
 

prometheus_es_exporter/indices_stats_parser.py

@@ -1,3 +1,5 @@
+from .utils import merge_dicts
+
 singular_forms = {
     'fields': 'field'
 }
@@ -24,15 +26,15 @@ def parse_block(block, metric=[], labels={}):
                     else:
                         singular_key = key
                     for n_key, n_value in value.items():
-                        result.extend(parse_block(n_value, metric=metric + [key], labels={**labels, singular_key: [n_key]}))
+                        result.extend(parse_block(n_value, metric=metric + [key], labels=merge_dicts(labels, {singular_key: [n_key]})))
                 else:
                     result.extend(parse_block(value, metric=metric + [key], labels=labels))
             elif isinstance(value, list) and key in bucket_list_keys:
                 bucket_name_key = bucket_list_keys[key]
 
                 for n_value in value:
                     bucket_name = n_value[bucket_name_key]
-                    result.extend(parse_block(n_value, metric=metric + [key], labels={**labels, bucket_name_key: [bucket_name]}))
+                    result.extend(parse_block(n_value, metric=metric + [key], labels=merge_dicts(labels, {bucket_name_key: [bucket_name]})))
 
     return result
 

prometheus_es_exporter/nodes_stats_parser.py

@@ -1,3 +1,5 @@
+from .utils import merge_dicts
+
 singular_forms = {
     'pools': 'pool',
     'collectors': 'collector',
@@ -35,21 +37,21 @@ def parse_block(block, metric=[], labels={}):
                     else:
                         singular_key = key
                     for n_key, n_value in value.items():
-                        result.extend(parse_block(n_value, metric=metric + [key], labels={**labels, singular_key: [n_key]}))
+                        result.extend(parse_block(n_value, metric=metric + [key], labels=merge_dicts(labels, {singular_key: [n_key]})))
                 else:
                     result.extend(parse_block(value, metric=metric + [key], labels=labels))
             elif isinstance(value, list) and key in bucket_list_keys:
                 bucket_name_key = bucket_list_keys[key]
 
                 for n_value in value:
                     bucket_name = n_value[bucket_name_key]
-                    result.extend(parse_block(n_value, metric=metric + [key], labels={**labels, bucket_name_key: [bucket_name]}))
+                    result.extend(parse_block(n_value, metric=metric + [key], labels=merge_dicts(labels, {bucket_name_key: [bucket_name]})))
 
     return result
 
 
 def parse_node(node, metric=[], labels={}):
-    labels = {**labels, 'node_name': [node['name']]}
+    labels = merge_dicts(labels, node_name=[node['name']])
 
     return parse_block(node, metric=metric, labels=labels)
 

prometheus_es_exporter/utils.py

@@ -0,0 +1,15 @@
+def merge_dicts(*dict_args, **extra_entries):
+    """
+    Given an arbitrary number of dictionaries, merge them into a
+    single new dictionary. Later dictionaries take precedence if
+    a key is shared by multiple dictionaries.
+
+    Extra entries can also be provided via kwargs. These entries
+    have the highest precedence.
+    """
+    res = {}
+
+    for d in dict_args + (extra_entries,):
+        res.update(d)
+
+    return res

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='prometheus-es-exporter',
-    version='0.4.1',
+    version='0.4.2',
     description='Elasticsearch query Prometheus exporter',
     url='https://github.com/Braedon/prometheus-es-exporter',
     author='Braedon Vickers',