Added keys_only and separator options to kv.get

Heuriskein · vagrant · commit 9d6a147c499a · 2015-04-02T02:39:12.000Z
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,7 @@ pip-log.txt
 
 # Ropemacs
 .ropeproject
+
+# IntelliJ project files
+*.iml
+.idea/
diff --git a/consul/base.py b/consul/base.py
@@ -121,6 +121,8 @@ def get(
                 wait=None,
                 token=None,
                 consistency=None,
+                keys=False,
+                separator=None,
                 dc=None):
             """
             Returns a tuple of (*index*, *value[s]*)
@@ -169,6 +171,10 @@ def get(
             dc = dc or self.agent.dc
             if dc:
                 params['dc'] = dc
+            if keys:
+                params['keys'] = True
+            if separator:
+                params['separator'] = separator
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
                 params[consistency] = '1'
@@ -180,11 +186,12 @@ def callback(response):
                     data = None
                 else:
                     data = json.loads(response.body)
-                    for item in data:
-                        if item.get('Value') is not None:
-                            item['Value'] = base64.b64decode(item['Value'])
-                    if not recurse:
-                        data = data[0]
+                    if not keys_only:
+                        for item in data:
+                            if item.get('Value') is not None:
+                                item['Value'] = base64.b64decode(item['Value'])
+                        if not recurse:
+                            data = data[0]
                 return response.headers['X-Consul-Index'], data
 
             return self.agent.http.get(
