python3: replace iteritems by items method (#40570)
This commit is contained in:
parent
21484832f2
commit
a6d0bc47a5
|
@ -482,7 +482,7 @@ class EngineCube(object):
|
||||||
joins = join_tree.get(alias or table_name, {}).get(kind)
|
joins = join_tree.get(alias or table_name, {}).get(kind)
|
||||||
if not joins:
|
if not joins:
|
||||||
continue
|
continue
|
||||||
for join_name, join in joins.iteritems():
|
for join_name, join in joins.items():
|
||||||
contain_joins = True
|
contain_joins = True
|
||||||
sql += ' %s ' % self.JOIN_KINDS[kind]
|
sql += ' %s ' % self.JOIN_KINDS[kind]
|
||||||
sql += ' ' + build_table_expression_helper(join_tree, join.table, alias=join.name, top=False)
|
sql += ' ' + build_table_expression_helper(join_tree, join.table, alias=join.name, top=False)
|
||||||
|
|
|
@ -123,7 +123,7 @@ class RelativeDate(date):
|
||||||
if 'timedelta' in template:
|
if 'timedelta' in template:
|
||||||
timedelta = template['timedelta']
|
timedelta = template['timedelta']
|
||||||
kwargs = {}
|
kwargs = {}
|
||||||
for key, group in timedelta.iteritems():
|
for key, group in timedelta.items():
|
||||||
if hasattr(group, 'encode'): # string like
|
if hasattr(group, 'encode'): # string like
|
||||||
sign = 1
|
sign = 1
|
||||||
if group.startswith('+'):
|
if group.startswith('+'):
|
||||||
|
|
|
@ -53,7 +53,7 @@ class Base(object):
|
||||||
__types__ = {}
|
__types__ = {}
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
for k, v in kwargs.iteritems():
|
for k, v in kwargs.items():
|
||||||
if k in self.__types__ and self.__types__ == 'str':
|
if k in self.__types__ and self.__types__ == 'str':
|
||||||
v = str(v)
|
v = str(v)
|
||||||
setattr(self, k, v)
|
setattr(self, k, v)
|
||||||
|
@ -383,7 +383,7 @@ class Cube(Base):
|
||||||
names.update(join.name for join in self.joins)
|
names.update(join.name for join in self.joins)
|
||||||
names.update(dimension.name for dimension in self.dimensions)
|
names.update(dimension.name for dimension in self.dimensions)
|
||||||
names.update(measure.name for measure in self.measures)
|
names.update(measure.name for measure in self.measures)
|
||||||
duplicates = [k for k, v in names.iteritems() if v > 1]
|
duplicates = [k for k, v in names.items() if v > 1]
|
||||||
if duplicates:
|
if duplicates:
|
||||||
raise SchemaError(
|
raise SchemaError(
|
||||||
'More than one join, dimension or measure with name(s) %s' % ', '.join(duplicates))
|
'More than one join, dimension or measure with name(s) %s' % ', '.join(duplicates))
|
||||||
|
@ -433,7 +433,7 @@ class Warehouse(Base):
|
||||||
|
|
||||||
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)
|
||||||
duplicates = [k for k, v in names.iteritems() if v > 1]
|
duplicates = [k for k, v in names.items() if v > 1]
|
||||||
if duplicates:
|
if duplicates:
|
||||||
raise SchemaError('More than one cube with name(s) %s' % ', '.join(duplicates))
|
raise SchemaError('More than one cube with name(s) %s' % ', '.join(duplicates))
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,7 @@ class Visualization(object):
|
||||||
def from_form(cls, cube, form):
|
def from_form(cls, cube, form):
|
||||||
cleaned_data = form.cleaned_data
|
cleaned_data = form.cleaned_data
|
||||||
filters = {}
|
filters = {}
|
||||||
for kw, values in cleaned_data.iteritems():
|
for kw, values in cleaned_data.items():
|
||||||
if values and kw.startswith('filter__'):
|
if values and kw.startswith('filter__'):
|
||||||
dimension_name = kw[8:]
|
dimension_name = kw[8:]
|
||||||
filters[dimension_name] = values
|
filters[dimension_name] = values
|
||||||
|
@ -137,7 +137,7 @@ class Visualization(object):
|
||||||
keys = [self.cube.engine.warehouse.name, self.cube.name]
|
keys = [self.cube.engine.warehouse.name, self.cube.name]
|
||||||
if self.loop:
|
if self.loop:
|
||||||
keys.append(self.loop.name)
|
keys.append(self.loop.name)
|
||||||
for kw, value in self.filters.iteritems():
|
for kw, value in self.filters.items():
|
||||||
if value is None:
|
if value is None:
|
||||||
continue
|
continue
|
||||||
elif isinstance(value, (dict, list, tuple)):
|
elif isinstance(value, (dict, list, tuple)):
|
||||||
|
|
|
@ -169,7 +169,7 @@ class VisualizationView(views.AuthorizationMixin, CubeDisplayMixin, DetailView):
|
||||||
'drilldown_x': self.visualization.drilldown_x and self.visualization.drilldown_x.name,
|
'drilldown_x': self.visualization.drilldown_x and self.visualization.drilldown_x.name,
|
||||||
'drilldown_y': self.visualization.drilldown_y and self.visualization.drilldown_y.name,
|
'drilldown_y': self.visualization.drilldown_y and self.visualization.drilldown_y.name,
|
||||||
}
|
}
|
||||||
for key, value in self.visualization.filters.iteritems() or []:
|
for key, value in self.visualization.filters.items() or []:
|
||||||
if isinstance(value, list):
|
if isinstance(value, list):
|
||||||
value = tuple(value)
|
value = tuple(value)
|
||||||
initial['filter__%s' % key] = value
|
initial['filter__%s' % key] = value
|
||||||
|
|
Loading…
Reference in New Issue