diff --git a/bijoe/engine.py b/bijoe/engine.py index 3934cd4..f83c599 100644 --- a/bijoe/engine.py +++ b/bijoe/engine.py @@ -482,7 +482,7 @@ class EngineCube(object): joins = join_tree.get(alias or table_name, {}).get(kind) if not joins: continue - for join_name, join in joins.iteritems(): + for join_name, join in joins.items(): contain_joins = True sql += ' %s ' % self.JOIN_KINDS[kind] sql += ' ' + build_table_expression_helper(join_tree, join.table, alias=join.name, top=False) diff --git a/bijoe/relative_time.py b/bijoe/relative_time.py index fbb6157..1ab9230 100644 --- a/bijoe/relative_time.py +++ b/bijoe/relative_time.py @@ -123,7 +123,7 @@ class RelativeDate(date): if 'timedelta' in template: timedelta = template['timedelta'] kwargs = {} - for key, group in timedelta.iteritems(): + for key, group in timedelta.items(): if hasattr(group, 'encode'): # string like sign = 1 if group.startswith('+'): diff --git a/bijoe/schemas.py b/bijoe/schemas.py index ec7b8dd..1b4afda 100644 --- a/bijoe/schemas.py +++ b/bijoe/schemas.py @@ -53,7 +53,7 @@ class Base(object): __types__ = {} 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': v = str(v) setattr(self, k, v) @@ -383,7 +383,7 @@ class Cube(Base): names.update(join.name for join in self.joins) names.update(dimension.name for dimension in self.dimensions) 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: raise SchemaError( 'More than one join, dimension or measure with name(s) %s' % ', '.join(duplicates)) @@ -433,7 +433,7 @@ class Warehouse(Base): def check(self): 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: raise SchemaError('More than one cube with name(s) %s' % ', '.join(duplicates)) diff --git a/bijoe/visualization/utils.py b/bijoe/visualization/utils.py index f284e2c..a08d457 100644 --- a/bijoe/visualization/utils.py +++ b/bijoe/visualization/utils.py @@ -114,7 +114,7 @@ class Visualization(object): def from_form(cls, cube, form): cleaned_data = form.cleaned_data filters = {} - for kw, values in cleaned_data.iteritems(): + for kw, values in cleaned_data.items(): if values and kw.startswith('filter__'): dimension_name = kw[8:] filters[dimension_name] = values @@ -137,7 +137,7 @@ class Visualization(object): keys = [self.cube.engine.warehouse.name, self.cube.name] if self.loop: keys.append(self.loop.name) - for kw, value in self.filters.iteritems(): + for kw, value in self.filters.items(): if value is None: continue elif isinstance(value, (dict, list, tuple)): diff --git a/bijoe/visualization/views.py b/bijoe/visualization/views.py index 836d43f..79c3b67 100644 --- a/bijoe/visualization/views.py +++ b/bijoe/visualization/views.py @@ -169,7 +169,7 @@ class VisualizationView(views.AuthorizationMixin, CubeDisplayMixin, DetailView): 'drilldown_x': self.visualization.drilldown_x and self.visualization.drilldown_x.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): value = tuple(value) initial['filter__%s' % key] = value