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

Use super() now that we require python3, less error prone

Browse Source
This commit is contained in:
Ross McFarland
2022-09-15 14:25:47 -07:00
parent 89aa8ee0bc
commit 66debc0b80
13 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
octodns/cmds/args.py
View File

@ -18,7 +18,7 @@ class ArgumentParser(_Base):
'''
def __init__(self, *args, **kwargs):
super(ArgumentParser, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
def parse_args(self, default_log_level=INFO):
version = f'octoDNS {__VERSION__}'
@ -50,7 +50,7 @@ class ArgumentParser(_Base):
'--debug', action='store_true', default=False, help=_help
)
args = super(ArgumentParser, self).parse_args()
args = super().parse_args()
self._setup_logging(args, default_log_level)
return args

6
octodns/cmds/report.py
View File

@ -16,13 +16,11 @@ from octodns.manager import Manager
class AsyncResolver(Resolver):
def __init__(self, num_workers, *args, **kwargs):
super(AsyncResolver, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.executor = ThreadPoolExecutor(max_workers=num_workers)
def query(self, *args, **kwargs):
return self.executor.submit(
super(AsyncResolver, self).query, *args, **kwargs
)
return self.executor.submit(super().query, *args, **kwargs)
def main():

2
octodns/processor/acme.py
View File

@ -25,7 +25,7 @@ class AcmeMangingProcessor(BaseProcessor):
- acme
...
'''
super(AcmeMangingProcessor, self).__init__(name)
super().__init__(name)
self._owned = set()

2
octodns/processor/ownership.py
View File

@ -15,7 +15,7 @@ from .base import BaseProcessor
# and thus "own" them going forward.
class OwnershipProcessor(BaseProcessor):
def __init__(self, name, txt_name='_owner', txt_value='*octodns*'):
super(OwnershipProcessor, self).__init__(name)
super().__init__(name)
self.txt_name = txt_name
self.txt_value = txt_value
self._txt_values = [txt_value]

2
octodns/provider/base.py
View File

@ -17,7 +17,7 @@ class BaseProvider(BaseSource):
delete_pcent_threshold=Plan.MAX_SAFE_DELETE_PCENT,
strict_supports=False,
):
super(BaseProvider, self).__init__(id)
super().__init__(id)
self.log.debug(
'__init__: id=%s, apply_disabled=%s, '
'update_pcent_threshold=%.2f, '

2
octodns/provider/plan.py
View File

@ -136,7 +136,7 @@ class _PlanOutput(object):
class PlanLogger(_PlanOutput):
def __init__(self, name, level='info'):
super(PlanLogger, self).__init__(name)
super().__init__(name)
try:
self.level = {
'debug': DEBUG,

4
octodns/provider/yaml.py
View File

@ -128,7 +128,7 @@ class YamlProvider(BaseProvider):
enforce_order,
populate_should_replace,
)
super(YamlProvider, self).__init__(id, *args, **kwargs)
super().__init__(id, *args, **kwargs)
self.directory = directory
self.default_ttl = default_ttl
self.enforce_order = enforce_order
@ -311,7 +311,7 @@ class SplitYamlProvider(YamlProvider):
CATCHALL_RECORD_NAMES = ('*', '')
def __init__(self, id, directory, extension='.', *args, **kwargs):
super(SplitYamlProvider, self).__init__(id, directory, *args, **kwargs)
super().__init__(id, directory, *args, **kwargs)
self.extension = extension
def _zone_directory(self, zone):

50
octodns/record/__init__.py
View File

@ -31,7 +31,7 @@ class Create(Change):
CLASS_ORDERING = 1
def __init__(self, new):
super(Create, self).__init__(None, new)
super().__init__(None, new)
def __repr__(self, leader=''):
source = self.new.source.id if self.new.source else ''
@ -57,7 +57,7 @@ class Delete(Change):
CLASS_ORDERING = 0
def __init__(self, existing):
super(Delete, self).__init__(existing, None)
super().__init__(existing, None)
def __repr__(self, leader=''):
return f'Delete {self.existing}'
@ -74,7 +74,7 @@ class ValidationError(RecordException):
return f'Invalid record {idna_decode(fqdn)}\n - {reasons}'
def __init__(self, fqdn, reasons):
super(Exception, self).__init__(self.build_message(fqdn, reasons))
super().__init__(self.build_message(fqdn, reasons))
self.fqdn = fqdn
self.reasons = reasons
@ -329,7 +329,7 @@ class GeoValue(EqualityTupleMixin):
class ValuesMixin(object):
@classmethod
def validate(cls, name, fqdn, data):
reasons = super(ValuesMixin, cls).validate(name, fqdn, data)
reasons = super().validate(name, fqdn, data)
values = data.get('values', data.get('value', []))
@ -338,7 +338,7 @@ class ValuesMixin(object):
return reasons
def __init__(self, zone, name, data, source=None):
super(ValuesMixin, self).__init__(zone, name, data, source=source)
super().__init__(zone, name, data, source=source)
try:
values = data['values']
except KeyError:
@ -348,10 +348,10 @@ class ValuesMixin(object):
def changes(self, other, target):
if self.values != other.values:
return Update(self, other)
return super(ValuesMixin, self).changes(other, target)
return super().changes(other, target)
def _data(self):
ret = super(ValuesMixin, self)._data()
ret = super()._data()
if len(self.values) > 1:
values = [getattr(v, 'data', v) for v in self.values if v]
if len(values) > 1:
@ -380,7 +380,7 @@ class _GeoMixin(ValuesMixin):
@classmethod
def validate(cls, name, fqdn, data):
reasons = super(_GeoMixin, cls).validate(name, fqdn, data)
reasons = super().validate(name, fqdn, data)
try:
geo = dict(data['geo'])
for code, values in geo.items():
@ -391,7 +391,7 @@ class _GeoMixin(ValuesMixin):
return reasons
def __init__(self, zone, name, data, *args, **kwargs):
super(_GeoMixin, self).__init__(zone, name, data, *args, **kwargs)
super().__init__(zone, name, data, *args, **kwargs)
try:
self.geo = dict(data['geo'])
except KeyError:
@ -400,7 +400,7 @@ class _GeoMixin(ValuesMixin):
self.geo[code] = GeoValue(code, values)
def _data(self):
ret = super(_GeoMixin, self)._data()
ret = super()._data()
if self.geo:
geo = {}
for code, value in self.geo.items():
@ -412,7 +412,7 @@ class _GeoMixin(ValuesMixin):
if target.SUPPORTS_GEO:
if self.geo != other.geo:
return Update(self, other)
return super(_GeoMixin, self).changes(other, target)
return super().changes(other, target)
def __repr__(self):
if self.geo:
@ -421,29 +421,29 @@ class _GeoMixin(ValuesMixin):
f'<{klass} {self._type} {self.ttl}, {self.decoded_fqdn}, '
f'{self.values}, {self.geo}>'
)
return super(_GeoMixin, self).__repr__()
return super().__repr__()
class ValueMixin(object):
@classmethod
def validate(cls, name, fqdn, data):
reasons = super(ValueMixin, cls).validate(name, fqdn, data)
reasons = super().validate(name, fqdn, data)
reasons.extend(
cls._value_type.validate(data.get('value', None), cls._type)
)
return reasons
def __init__(self, zone, name, data, source=None):
super(ValueMixin, self).__init__(zone, name, data, source=source)
super().__init__(zone, name, data, source=source)
self.value = self._value_type.process(data['value'])
def changes(self, other, target):
if self.value != other.value:
return Update(self, other)
return super(ValueMixin, self).changes(other, target)
return super().changes(other, target)
def _data(self):
ret = super(ValueMixin, self)._data()
ret = super()._data()
if self.value:
ret['value'] = getattr(self.value, 'data', self.value)
return ret
@ -565,7 +565,7 @@ class _DynamicMixin(object):
@classmethod
def validate(cls, name, fqdn, data):
reasons = super(_DynamicMixin, cls).validate(name, fqdn, data)
reasons = super().validate(name, fqdn, data)
if 'dynamic' not in data:
return reasons
@ -724,7 +724,7 @@ class _DynamicMixin(object):
return reasons
def __init__(self, zone, name, data, *args, **kwargs):
super(_DynamicMixin, self).__init__(zone, name, data, *args, **kwargs)
super().__init__(zone, name, data, *args, **kwargs)
self.dynamic = {}
@ -754,7 +754,7 @@ class _DynamicMixin(object):
self.dynamic = _Dynamic(pools, parsed)
def _data(self):
ret = super(_DynamicMixin, self)._data()
ret = super()._data()
if self.dynamic:
ret['dynamic'] = self.dynamic._data()
return ret
@ -763,7 +763,7 @@ class _DynamicMixin(object):
if target.SUPPORTS_DYNAMIC:
if self.dynamic != other.dynamic:
return Update(self, other)
return super(_DynamicMixin, self).changes(other, target)
return super().changes(other, target)
def __repr__(self):
# TODO: improve this whole thing, we need multi-line...
@ -781,7 +781,7 @@ class _DynamicMixin(object):
f'<{klass} {self._type} {self.ttl}, {self.decoded_fqdn}, '
f'{values}, {self.dynamic}>'
)
return super(_DynamicMixin, self).__repr__()
return super().__repr__()
class _IpList(object):
@ -885,7 +885,7 @@ class AliasRecord(ValueMixin, Record):
reasons = []
if name != '':
reasons.append('non-root ALIAS not allowed')
reasons.extend(super(AliasRecord, cls).validate(name, fqdn, data))
reasons.extend(super().validate(name, fqdn, data))
return reasons
@ -951,7 +951,7 @@ class CnameRecord(_DynamicMixin, ValueMixin, Record):
reasons = []
if name == '':
reasons.append('root CNAME not allowed')
reasons.extend(super(CnameRecord, cls).validate(name, fqdn, data))
reasons.extend(super().validate(name, fqdn, data))
return reasons
@ -1352,7 +1352,7 @@ class PtrValue(_TargetValue):
reasons.append('missing values')
for value in values:
reasons.extend(super(PtrValue, cls).validate(value, _type))
reasons.extend(super().validate(value, _type))
return reasons
@ -1578,7 +1578,7 @@ class SrvRecord(ValuesMixin, Record):
reasons = []
if not cls._name_re.match(name):
reasons.append('invalid name for SRV record')
reasons.extend(super(SrvRecord, cls).validate(name, fqdn, data))
reasons.extend(super().validate(name, fqdn, data))
return reasons

14
octodns/source/axfr.py
View File

@ -40,7 +40,7 @@ class AxfrBaseSource(BaseSource):
)
def __init__(self, id):
super(AxfrBaseSource, self).__init__(id)
super().__init__(id)
def _data_for_multiple(self, _type, records):
return {
@ -186,9 +186,7 @@ class AxfrSourceException(Exception):
class AxfrSourceZoneTransferFailed(AxfrSourceException):
def __init__(self):
super(AxfrSourceZoneTransferFailed, self).__init__(
'Unable to Perform Zone Transfer'
)
super().__init__('Unable to Perform Zone Transfer')
class AxfrSource(AxfrBaseSource):
@ -204,7 +202,7 @@ class AxfrSource(AxfrBaseSource):
def __init__(self, id, master):
self.log = logging.getLogger(f'AxfrSource[{id}]')
self.log.debug('__init__: id=%s, master=%s', id, master)
super(AxfrSource, self).__init__(id)
super().__init__(id)
self.master = master
def zone_records(self, zone):
@ -238,12 +236,12 @@ class ZoneFileSourceException(Exception):
class ZoneFileSourceNotFound(ZoneFileSourceException):
def __init__(self):
super(ZoneFileSourceNotFound, self).__init__('Zone file not found')
super().__init__('Zone file not found')
class ZoneFileSourceLoadFailure(ZoneFileSourceException):
def __init__(self, error):
super(ZoneFileSourceLoadFailure, self).__init__(str(error))
super().__init__(str(error))
class ZoneFileSource(AxfrBaseSource):
@ -275,7 +273,7 @@ class ZoneFileSource(AxfrBaseSource):
file_extension,
check_origin,
)
super(ZoneFileSource, self).__init__(id)
super().__init__(id)
self.directory = directory
self.file_extension = file_extension
self.check_origin = check_origin

6
octodns/source/envvar.py
View File

@ -11,9 +11,7 @@ class EnvVarSourceException(Exception):
class EnvironmentVariableNotFoundException(EnvVarSourceException):
def __init__(self, data):
super(EnvironmentVariableNotFoundException, self).__init__(
f'Unknown environment variable {data}'
)
super().__init__(f'Unknown environment variable {data}')
class EnvVarSource(BaseSource):
@ -73,7 +71,7 @@ class EnvVarSource(BaseSource):
name,
ttl,
)
super(EnvVarSource, self).__init__(id)
super().__init__(id)
self.envvar = variable
self.name = name
self.ttl = ttl

4
octodns/source/tinydns.py
View File

@ -23,7 +23,7 @@ class TinyDnsBaseSource(BaseSource):
split_re = re.compile(r':+')
def __init__(self, id, default_ttl=3600):
super(TinyDnsBaseSource, self).__init__(id)
super().__init__(id)
self.default_ttl = default_ttl
def _data_for_A(self, _type, records):
@ -239,7 +239,7 @@ class TinyDnsFileSource(TinyDnsBaseSource):
directory,
default_ttl,
)
super(TinyDnsFileSource, self).__init__(id, default_ttl)
super().__init__(id, default_ttl)
self.directory = directory
self._cache = None

4
tests/helpers.py
View File

@ -95,7 +95,7 @@ class TemporaryDirectory(object):
class WantsConfigProcessor(BaseProcessor):
def __init__(self, name, some_config):
super(WantsConfigProcessor, self).__init__(name)
super().__init__(name)
class PlannableProvider(BaseProvider):
@ -106,7 +106,7 @@ class PlannableProvider(BaseProvider):
SUPPORTS = set(('A', 'AAAA', 'TXT'))
def __init__(self, *args, **kwargs):
super(PlannableProvider, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
def populate(self, zone, source=False, target=False, lenient=False):
pass

4
tests/test_octodns_provider_base.py
View File

@ -53,7 +53,7 @@ class HelperProvider(BaseProvider):
class TrickyProcessor(BaseProcessor):
def __init__(self, name, add_during_process_target_zone):
super(TrickyProcessor, self).__init__(name)
super().__init__(name)
self.add_during_process_target_zone = add_during_process_target_zone
self.reset()
@ -640,7 +640,7 @@ class TestBaseProvider(TestCase):
def __init__(self, **kwargs):
self.log = MagicMock()
super(MinimalProvider, self).__init__('minimal', **kwargs)
super().__init__('minimal', **kwargs)
normal = MinimalProvider(strict_supports=False)
# Should log and not expect