f-strings for AkamaiProvider

octodns/provider/edgedns.py

@@ -59,34 +59,34 @@ class AkamaiClient(object):
         return resp
 
     def record_create(self, zone, name, record_type, content):
-        path = 'zones/{}/names/{}/types/{}'.format(zone, name, record_type)
+        path = f'zones/{zone}/names/{name}/types/{record_type}'
         result = self._request('POST', path, data=content)
 
         return result
 
     def record_delete(self, zone, name, record_type):
-        path = 'zones/{}/names/{}/types/{}'.format(zone, name, record_type)
+        path = f'zones/{zone}/names/{name}/types/{record_type}'
         result = self._request('DELETE', path)
 
         return result
 
     def record_replace(self, zone, name, record_type, content):
-        path = 'zones/{}/names/{}/types/{}'.format(zone, name, record_type)
+        path = f'zones/{zone}/names/{name}/types/{record_type}'
         result = self._request('PUT', path, data=content)
 
         return result
 
     def zone_get(self, zone):
-        path = 'zones/{}'.format(zone)
+        path = f'zones/{zone}'
         result = self._request('GET', path)
 
         return result
 
     def zone_create(self, contractId, params, gid=None):
-        path = 'zones?contractId={}'.format(contractId)
+        path = f'zones?contractId={contractId}'
 
         if gid is not None:
-            path += '&gid={}'.format(gid)
+            path += f'&gid={gid}'
 
         result = self._request('POST', path, data=params)
 
@@ -104,7 +104,7 @@ class AkamaiClient(object):
             'types': types
         }
 
-        path = 'zones/{}/recordsets'.format(zone)
+        path = f'zones/{zone}/recordsets'
         result = self._request('GET', path, params=params)
 
         return result
@@ -167,7 +167,7 @@ class AkamaiProvider(BaseProvider):
     def __init__(self, id, client_secret, host, access_token, client_token,
                  contract_id=None, gid=None, *args, **kwargs):
 
-        self.log = getLogger('AkamaiProvider[{}]'.format(id))
+        self.log = getLogger(f'AkamaiProvider[{id}]')
         self.log.debug('__init__: id=%s, ')
         super(AkamaiProvider, self).__init__(id, *args, **kwargs)
 
@@ -212,7 +212,7 @@ class AkamaiProvider(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[0]),
                                     source=self, lenient=lenient)
                 zone.add_record(record, lenient=lenient)
@@ -239,7 +239,7 @@ class AkamaiProvider(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)
@@ -249,7 +249,7 @@ class AkamaiProvider(BaseProvider):
         new = change.new
         record_type = new._type
 
-        params_for = getattr(self, '_params_for_{}'.format(record_type))
+        params_for = getattr(self, f'_params_for_{record_type}')
         values = self._get_values(new.data)
         rdata = params_for(values)
 
@@ -282,7 +282,7 @@ class AkamaiProvider(BaseProvider):
         new = change.new
         record_type = new._type
 
-        params_for = getattr(self, '_params_for_{}'.format(record_type))
+        params_for = getattr(self, f'_params_for_{record_type}')
         values = self._get_values(new.data)
         rdata = params_for(values)
 
@@ -316,7 +316,7 @@ class AkamaiProvider(BaseProvider):
     def _data_for_CNAME(self, _type, records):
         value = records['rdata'][0]
         if (value[-1] != '.'):
-            value = '{}.'.format(value)
+            value = f'{value}.'
 
         return {
             'ttl': records['ttl'],
@@ -429,9 +429,7 @@ class AkamaiProvider(BaseProvider):
         for r in values:
             preference = r['preference']
             exchange = r['exchange']
-
+            rdata.append(f'{preference} {exchange}')
-            record = '{} {}'.format(preference, exchange)
-            rdata.append(record)
 
         return rdata
 
@@ -445,9 +443,7 @@ class AkamaiProvider(BaseProvider):
             srvc = "\"" + r['service'] + "\""
             rgx = "\"" + r['regexp'] + "\""
             rpl = r['replacement']
-
+            rdata.append(f'{ordr} {prf} {flg} {srvc} {rgx} {rpl}')
-            record = '{} {} {} {} {} {}'.format(ordr, prf, flg, srvc, rgx, rpl)
-            rdata.append(record)
 
         return rdata
 
@@ -467,9 +463,7 @@ class AkamaiProvider(BaseProvider):
             weight = r['weight']
             port = r['port']
             target = r['target']
-
+            rdata.append(f'{priority} {weight} {port} {target}')
-            record = '{} {} {} {}'.format(priority, weight, port, target)
-            rdata.append(record)
 
         return rdata
 
@@ -480,8 +474,7 @@ class AkamaiProvider(BaseProvider):
             fp_type = r['fingerprint_type']
             fp = r['fingerprint']
 
-            record = '{} {} {}'.format(algorithm, fp_type, fp)
+            rdata.append(f'{algorithm} {fp_type} {fp}')
-            rdata.append(record)
 
         return rdata