Merge pull request #120 from lowzj/support-python26

cablehead · web-flow · commit 149774cd3b7f · 2016-12-18T13:26:43.000-08:00
update base.py to support python2.6 fix #119
diff --git a/consul/base.py b/consul/base.py
@@ -1978,37 +1978,37 @@ def _query_data(self, service=None,
                         tags=None,
                         ttl=None,
                         regexp=None):
-            service_body = {
-                k: v for k, v in {
+            service_body = dict([
+                (k, v) for k, v in {
                     'service': service,
                     'onlypassing': onlypassing,
                     'tags': tags,
-                    'failover': {
-                        k: v for k, v in {
+                    'failover': dict([
+                        (k, v) for k, v in {
                             'nearestn': nearestn,
                             'datacenters': datacenters
                         }.items() if v is not None
-                    }
+                    ])
                 }.items() if v is not None
-            }
+            ])
 
-            data = {
-                k: v for k, v in {
+            data = dict([
+                (k, v) for k, v in {
                     'name': name,
                     'session': session,
                     'token': token or self.agent.token,
                     'dns': {
                         'ttl': ttl
                     } if ttl is not None else None,
-                    'template': {
-                        k: v for k, v in {
+                    'template': dict([
+                        (k, v) for k, v in {
                             'type': 'name_prefix_match',
                             'regexp': regexp
                         }.items() if v is not None
-                    },
+                    ]),
                     'service': service_body
                 }.items() if v is not None
-            }
+            ])
             return json.dumps(data)
 
         def create(self, service,
diff --git a/consul/twisted.py b/consul/twisted.py
@@ -82,10 +82,10 @@ def compat_string(value):
     def _get_resp(self, response):
         # Merge multiple header values as per RFC2616
         # http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
-        headers = {
-            self.compat_string(k): ','.join(map(self.compat_string, v))
+        headers = dict([
+            (self.compat_string(k), ','.join(map(self.compat_string, v)))
             for k, v in dict(response.headers.getAllRawHeaders()).items()
-        }
+        ])
         body = yield response.text(encoding='utf-8')
         returnValue((response.code, headers, body))
 
