Skip to content
This repository was archived by the owner on Apr 15, 2024. It is now read-only.

update base.py to support python2.6 #120

Merged
cablehead merged 1 commit into from
Dec 18, 2016
Merged

update base.py to support python2.6 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions consul/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,37 +1910,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,
Expand Down
6 changes: 3 additions & 3 deletions consul/twisted.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down