diff --git a/monasca_analytics/banana/grammar/ast.py b/monasca_analytics/banana/grammar/ast.py index fde6958..0e308e7 100644 --- a/monasca_analytics/banana/grammar/ast.py +++ b/monasca_analytics/banana/grammar/ast.py @@ -296,7 +296,7 @@ class Expr(ASTNode): if isinstance(expr_tree, p.ParseResults): expr_tree = expr_tree.asList() if isinstance(expr_tree, list): - for i in xrange(0, len(expr_tree)): + for i in range(0, len(expr_tree)): if isinstance(expr_tree[i], list): expr_tree[i] = Expr(span, expr_tree[i]) self.expr_tree = expr_tree diff --git a/monasca_analytics/banana/grammar/base_ast.py b/monasca_analytics/banana/grammar/base_ast.py index 0885d7a..f3f8893 100644 --- a/monasca_analytics/banana/grammar/base_ast.py +++ b/monasca_analytics/banana/grammar/base_ast.py @@ -118,7 +118,7 @@ class Span(object): startcolno = 0 endlineno = 0 endcolno = 0 - for lineno in xrange(0, len(splitted)): + for lineno in range(0, len(splitted)): line = splitted[lineno] if current_pos <= self.lo <= len(line) + current_pos: startlineno = lineno + 1 @@ -139,7 +139,7 @@ class Span(object): splitted = self._text.splitlines() current_pos = 0 lineno = 0 - for _ in xrange(0, len(splitted)): + for _ in range(0, len(splitted)): line = splitted[lineno] if current_pos < self.lo < len(line) + current_pos: return lineno + 1 diff --git a/monasca_analytics/banana/grammar/config.py b/monasca_analytics/banana/grammar/config.py index 5b564d4..38f35a1 100644 --- a/monasca_analytics/banana/grammar/config.py +++ b/monasca_analytics/banana/grammar/config.py @@ -93,7 +93,7 @@ def banana_grammar(emitter=emit.PrintEmitter()): def action_create_connections(s, l, t): ast_conn = ast.into_connection(t[0]) ast_conn.span = ast.make_span(s, l, t) - for i in xrange(1, len(t)): + for i in range(1, len(t)): next_conn = ast.into_connection(t[i]) ast_conn.connect_to(next_conn, emitter) return ast_conn diff --git a/monasca_analytics/ldp/monasca_aggregate.py b/monasca_analytics/ldp/monasca_aggregate.py index 1cb4753..13f33b6 100644 --- a/monasca_analytics/ldp/monasca_aggregate.py +++ b/monasca_analytics/ldp/monasca_aggregate.py @@ -143,12 +143,12 @@ class MonascaAggregateLDP(bt.BaseLDP): lambda x: x["metric"]["timestamp"], l), separated_metrics) metric_count = len(separated_metrics) - for index in xrange(0, len(separated_metrics[0])): + for index in range(0, len(separated_metrics[0])): new_value = reducer[0]( separated_metrics[0][index]["metric"]["value"], metric_count) new_timestamp = separated_metrics[0][index]["metric"]["timestamp"] - for metric_index in xrange(1, metric_count): + for metric_index in range(1, metric_count): new_value = reducer[1](new_value, helpers.interpolate( new_timestamp, separated_metrics[metric_index], diff --git a/monasca_analytics/ldp/monasca_combine.py b/monasca_analytics/ldp/monasca_combine.py index 371f8fa..aa46849 100644 --- a/monasca_analytics/ldp/monasca_combine.py +++ b/monasca_analytics/ldp/monasca_combine.py @@ -113,13 +113,13 @@ class MonascaCombineLDP(bt.BaseLDP): lambda l: map( lambda x: x["metric"]["timestamp"], l[1]), separated_metrics) - for index in xrange(0, len(separated_metrics[0][1])): + for index in range(0, len(separated_metrics[0][1])): current_env = { separated_metrics[0][0]: separated_metrics[0][1][index]["metric"]["value"] } timestamp = all_timestamp[0][index] - for metric_index in xrange(1, len(separated_metrics)): + for metric_index in range(1, len(separated_metrics)): metric_prop = separated_metrics[metric_index] metric_name = metric_prop[0] current_env[metric_name] = helpers.interpolate( diff --git a/monasca_analytics/ldp/monasca_derivative.py b/monasca_analytics/ldp/monasca_derivative.py index c93a7c2..e4bba80 100644 --- a/monasca_analytics/ldp/monasca_derivative.py +++ b/monasca_analytics/ldp/monasca_derivative.py @@ -116,7 +116,7 @@ class MonascaDerivativeLDP(bt.BaseLDP): last_timestamp = timestamps[0] tmp_all_values = [all_values[0]] tmp_timestamps = [last_timestamp] - for index in xrange(1, len(timestamps)): + for index in range(1, len(timestamps)): if timestamps[index] == last_timestamp: continue else: @@ -135,7 +135,7 @@ class MonascaDerivativeLDP(bt.BaseLDP): float(all_values[1] - all_values[0]) / float(timestamps[1] - timestamps[0]) ] - for index in xrange(1, n): + for index in range(1, n): new_values.append( float(all_values[index + 1] - all_values[index - 1]) / float(timestamps[index + 1] - timestamps[index - 1]) diff --git a/test/ldp/test_monasca_aggregator.py b/test/ldp/test_monasca_aggregator.py index 9f8b9bb..3748ef8 100644 --- a/test/ldp/test_monasca_aggregator.py +++ b/test/ldp/test_monasca_aggregator.py @@ -37,7 +37,7 @@ class TestMonascaAggregateLDP(MonanasTestCase): # iterable = map(lambda i: {"metric": {"value": i}}, iterable) cnt = len(iterable) acc = fn[0](iterable[0], cnt) - for index in xrange(1, cnt): + for index in range(1, cnt): acc = fn[1](acc, iterable[index], cnt) return acc