Browse Source

Revert "the *Value.data properties are no longer needed"

The mythicbeasts module (at least) is relying on them

This reverts commit 5d2ef02390.
pull/929/head
Ross McFarland 3 years ago
parent
commit
d439e70419
No known key found for this signature in database GPG Key ID: 943B179E15D3B22A
1 changed files with 24 additions and 6 deletions
  1. +24
    -6
      octodns/record/__init__.py

+ 24
- 6
octodns/record/__init__.py View File

@ -339,10 +339,6 @@ class ValuesMixin(object):
def _data(self):
ret = super(ValuesMixin, self)._data()
if len(self.values) > 1:
# we still look for a .data here for backwards compat reasons, any
# 3rd party value types may still rely on it (they should be
# transitioned, perhaps we should deprecate, warn if it exists and
# remove it in 1.0
values = [getattr(v, 'data', v) for v in self.values if v]
if len(values) > 1:
ret['values'] = values
@ -351,7 +347,6 @@ class ValuesMixin(object):
elif len(self.values) == 1:
v = self.values[0]
if v:
# see getattr note above
ret['value'] = getattr(v, 'data', v)
return ret
@ -436,7 +431,6 @@ class ValueMixin(object):
def _data(self):
ret = super(ValueMixin, self)._data()
if self.value:
# see getattr note above
ret['value'] = getattr(self.value, 'data', self.value)
return ret
@ -947,6 +941,10 @@ class CaaValue(EqualityTupleMixin, dict):
def value(self, value):
self['value'] = value
@property
def data(self):
return self
def _equality_tuple(self):
return (self.flags, self.tag, self.value)
@ -1198,6 +1196,10 @@ class LocValue(EqualityTupleMixin, dict):
def precision_vert(self, value):
self['precision_vert'] = value
@property
def data(self):
return self
def __hash__(self):
return hash(
(
@ -1319,6 +1321,10 @@ class MxValue(EqualityTupleMixin, dict):
def exchange(self, value):
self['exchange'] = value
@property
def data(self):
return self
def __hash__(self):
return hash((self.preference, self.exchange))
@ -1436,6 +1442,10 @@ class NaptrValue(EqualityTupleMixin, dict):
def replacement(self, value):
self['replacement'] = value
@property
def data(self):
return self
def __hash__(self):
return hash(self.__repr__())
@ -1603,6 +1613,10 @@ class SshfpValue(EqualityTupleMixin, dict):
def fingerprint(self, value):
self['fingerprint'] = value
@property
def data(self):
return self
def __hash__(self):
return hash(self.__repr__())
@ -1762,6 +1776,10 @@ class SrvValue(EqualityTupleMixin, dict):
def target(self, value):
self['target'] = value
@property
def data(self):
return self
def __hash__(self):
return hash(self.__repr__())


Loading…
Cancel
Save