python3: avoid __slots__ conflicts with class variable (#40570)

This commit is contained in:
Nicolas Roche 2020-03-09 17:24:41 +01:00
parent 8a9769eb4d
commit 9a4d84aba0
1 changed files with 26 additions and 21 deletions

View File

@ -167,20 +167,19 @@ class Dimension(Base):
'absent_label': six.text_type, 'absent_label': six.text_type,
} }
label = None
value_label = None
order_by = None
group_by = None
join = None
filter = True
filter_in_join = False
filter_value = None
filter_expression = None
filter_needs_join = True
members_query = None
absent_label = None
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.label = None
self.value_label = None
self.order_by = None
self.group_by = None
self.join = None
self.filter = True
self.filter_in_join = False
self.filter_value = None
self.filter_expression = None
self.filter_needs_join = True
self.members_query = None
self.absent_label = None
super(Dimension, self).__init__(**kwargs) super(Dimension, self).__init__(**kwargs)
if not self.absent_label: if not self.absent_label:
if self.type in ('date', 'integer', 'string'): if self.type in ('date', 'integer', 'string'):
@ -345,7 +344,9 @@ class Join(Base):
'kind': join_kind, 'kind': join_kind,
} }
kind = 'full' def __init__(self, **kwargs):
self.kind = 'full'
super(Join, self).__init__(**kwargs)
@property @property
def master_table(self): def master_table(self):
@ -369,11 +370,13 @@ class Cube(Base):
'warnings': [six.text_type], 'warnings': [six.text_type],
} }
json_field = None def __init__(self, **kwargs):
joins = () self.json_field = None
dimensions = () self.joins = ()
measures = () self.dimensions = ()
warnings = () self.measures = ()
self.warnings = ()
super(Cube, self).__init__(**kwargs)
def check(self): def check(self):
names = collections.Counter() names = collections.Counter()
@ -423,8 +426,10 @@ class Warehouse(Base):
'path': str, 'path': str,
} }
path = None def __init__(self, **kwargs):
slug = None self.path = None
self.slug = None
super(Warehouse, self).__init__(**kwargs)
def check(self): def check(self):
names = collections.Counter(cube.name for cube in self.cubes) names = collections.Counter(cube.name for cube in self.cubes)