Browse Source

f-strings for DigitalOceanProvider

pull/768/head
Ross McFarland 4 years ago
parent
commit
5104467067
No known key found for this signature in database GPG Key ID: 943B179E15D3B22A
1 changed files with 15 additions and 19 deletions
  1. +15
    -19
      octodns/provider/digitalocean.py

+ 15
- 19
octodns/provider/digitalocean.py View File

@ -35,11 +35,11 @@ class DigitalOceanClient(object):
def __init__(self, token):
sess = Session()
sess.headers.update({'Authorization': 'Bearer {}'.format(token)})
sess.headers.update({'Authorization': f'Bearer {token}'})
self._sess = sess
def _request(self, method, path, params=None, data=None):
url = '{}{}'.format(self.BASE, path)
url = f'{self.BASE}{path}'
resp = self._sess.request(method, url, params=params, json=data)
if resp.status_code == 401:
raise DigitalOceanClientUnauthorized()
@ -49,7 +49,7 @@ class DigitalOceanClient(object):
return resp
def domain(self, name):
path = '/domains/{}'.format(name)
path = f'/domains/{name}'
return self._request('GET', path).json()
def domain_create(self, name):
@ -64,7 +64,7 @@ class DigitalOceanClient(object):
self.record_delete(name, record['id'])
def records(self, zone_name):
path = '/domains/{}/records'.format(zone_name)
path = f'/domains/{zone_name}/records'
ret = []
page = 1
@ -95,7 +95,7 @@ class DigitalOceanClient(object):
return ret
def record_create(self, zone_name, params):
path = '/domains/{}/records'.format(zone_name)
path = f'/domains/{zone_name}/records'
# change empty name string to @, DO uses @ for apex record names
if params['name'] == '':
params['name'] = '@'
@ -103,7 +103,7 @@ class DigitalOceanClient(object):
self._request('POST', path, data=params)
def record_delete(self, zone_name, record_id):
path = '/domains/{}/records/{}'.format(zone_name, record_id)
path = f'/domains/{zone_name}/records/{record_id}'
self._request('DELETE', path)
@ -121,7 +121,7 @@ class DigitalOceanProvider(BaseProvider):
SUPPORTS = set(('A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'TXT', 'SRV'))
def __init__(self, id, token, *args, **kwargs):
self.log = logging.getLogger('DigitalOceanProvider[{}]'.format(id))
self.log = logging.getLogger(f'DigitalOceanProvider[{id}]')
self.log.debug('__init__: id=%s, token=***', id)
super(DigitalOceanProvider, self).__init__(id, *args, **kwargs)
self._client = DigitalOceanClient(token)
@ -157,7 +157,7 @@ class DigitalOceanProvider(BaseProvider):
return {
'ttl': record['ttl'],
'type': _type,
'value': '{}.'.format(record['data'])
'value': f'{record["data"]}.'
}
def _data_for_MX(self, _type, records):
@ -165,7 +165,7 @@ class DigitalOceanProvider(BaseProvider):
for record in records:
values.append({
'preference': record['priority'],
'exchange': '{}.'.format(record['data'])
'exchange': f'{record["data"]}.'
})
return {
'ttl': records[0]['ttl'],
@ -176,8 +176,7 @@ class DigitalOceanProvider(BaseProvider):
def _data_for_NS(self, _type, records):
values = []
for record in records:
data = '{}.'.format(record['data'])
values.append(data)
values.append(f'{record["data"]}.')
return {
'ttl': records[0]['ttl'],
'type': _type,
@ -187,10 +186,7 @@ class DigitalOceanProvider(BaseProvider):
def _data_for_SRV(self, _type, records):
values = []
for record in records:
target = (
'{}.'.format(record['data'])
if record['data'] != "." else "."
)
target = f'{record["data"]}.' if record['data'] != "." else "."
values.append({
'port': record['port'],
'priority': record['priority'],
@ -237,7 +233,7 @@ class DigitalOceanProvider(BaseProvider):
before = len(zone.records)
for name, types in values.items():
for _type, records in types.items():
data_for = getattr(self, '_data_for_{}'.format(_type))
data_for = getattr(self, f'_data_for_{_type}')
record = Record.new(zone, name, data_for(_type, records),
source=self, lenient=lenient)
zone.add_record(record, lenient=lenient)
@ -263,7 +259,7 @@ class DigitalOceanProvider(BaseProvider):
def _params_for_CAA(self, record):
for value in record.values:
yield {
'data': '{}.'.format(value.value),
'data': f'{value.value}.',
'flags': value.flags,
'name': record.name,
'tag': value.tag,
@ -316,7 +312,7 @@ class DigitalOceanProvider(BaseProvider):
def _apply_Create(self, change):
new = change.new
params_for = getattr(self, '_params_for_{}'.format(new._type))
params_for = getattr(self, f'_params_for_{new._type}')
for params in params_for(new):
self._client.record_create(new.zone.name[:-1], params)
@ -347,7 +343,7 @@ class DigitalOceanProvider(BaseProvider):
for change in changes:
class_name = change.__class__.__name__
getattr(self, '_apply_{}'.format(class_name))(change)
getattr(self, f'_apply_{class_name}')(change)
# Clear out the cache if any
self._zone_records.pop(desired.name, None)

Loading…
Cancel
Save