From af8a9f10b266be6a4f0a4312f68f14b04fa25d02 Mon Sep 17 00:00:00 2001 From: Bo Wang Date: Tue, 19 Jan 2016 00:33:14 +0800 Subject: [PATCH] Python3:Replace iter.next() with next(iter) function next() of iterator is not available in python3. ref:http://www.diveintopython3.net/porting-code-to-python-3-with-2to3.html Targets blueprint: murano-python-3-support Change-Id: I8cb74520187ba532ad98b86b6ac15737a6cc9bee --- .../murano_exampleplugin/murano_exampleplugin/__init__.py | 2 +- murano/engine/system/yaql_functions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/plugins/murano_exampleplugin/murano_exampleplugin/__init__.py b/contrib/plugins/murano_exampleplugin/murano_exampleplugin/__init__.py index c80640cb..ea40d646 100644 --- a/contrib/plugins/murano_exampleplugin/murano_exampleplugin/__init__.py +++ b/contrib/plugins/murano_exampleplugin/murano_exampleplugin/__init__.py @@ -38,7 +38,7 @@ class GlanceClient(object): images = self.client.images.list() while True: try: - image = images.next() + image = next(images) yield GlanceClient._format(image) except StopIteration: break diff --git a/murano/engine/system/yaql_functions.py b/murano/engine/system/yaql_functions.py index e7889ded..c5fd10fd 100644 --- a/murano/engine/system/yaql_functions.py +++ b/murano/engine/system/yaql_functions.py @@ -179,7 +179,7 @@ def random_name(): @specs.extension_method def first_or_default(collection, default=None): try: - return iter(collection).next() + return next(iter(collection)) except StopIteration: return default