1
0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00

Merge remote-tracking branch 'origin/master' into show-zone-create

This commit is contained in:
Ross McFarland
2018-03-03 10:18:32 -08:00
35 changed files with 1419 additions and 164 deletions

View File

@@ -75,9 +75,9 @@ class Ns1Provider(BaseProvider):
else:
values.extend(answer['answer'])
codes.append([])
values = [str(x) for x in values]
values = [unicode(x) for x in values]
geo = OrderedDict(
{str(k): [str(x) for x in v] for k, v in geo.items()}
{unicode(k): [unicode(x) for x in v] for k, v in geo.items()}
)
data['values'] = values
data['geo'] = geo
@@ -236,11 +236,10 @@ class Ns1Provider(BaseProvider):
},
)
params['filters'] = []
if len(params['answers']) > 1:
if has_country:
params['filters'].append(
{"filter": "shuffle", "config": {}}
)
if has_country:
params['filters'].append(
{"filter": "geotarget_country", "config": {}}
)