From 63ef40f1be62336ed925f0b70aa1b9e074b55b2d Mon Sep 17 00:00:00 2001 From: Sirushti Murugesan Date: Wed, 22 Apr 2015 22:23:46 +0530 Subject: [PATCH] Update xrange and lambda for python3 partial blueprint heat-python34-support Change-Id: I0b4ebf640083e63d6d1d461bf0c97778d19d770e --- heat/api/cfn/v1/stacks.py | 2 +- heat/engine/resources/openstack/heat/random_string.py | 4 ++-- heat/engine/scheduler.py | 2 +- heat/tests/test_heatclient.py | 2 +- heat/tests/test_swiftsignal.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 0eac238d0e..27e847e4bb 100644 --- a/heat/api/cfn/v1/stacks.py +++ b/heat/api/cfn/v1/stacks.py @@ -165,7 +165,7 @@ class StackController(object): } def replacecolon(d): - return dict(map(lambda (k, v): (k.replace(':', '.'), v), + return dict(map(lambda k_v: (k_v[0].replace(':', '.'), k_v[1]), d.items())) def transform(attrs): diff --git a/heat/engine/resources/openstack/heat/random_string.py b/heat/engine/resources/openstack/heat/random_string.py index dcc8e101f8..b2747d9739 100644 --- a/heat/engine/resources/openstack/heat/random_string.py +++ b/heat/engine/resources/openstack/heat/random_string.py @@ -181,7 +181,7 @@ class RandomString(resource.Resource): for char_seq in char_sequences: seq = char_seq[self.CHARACTER_SEQUENCES_SEQUENCE] seq_min = char_seq[self.CHARACTER_SEQUENCES_MIN] - for i in xrange(seq_min): + for i in six.moves.xrange(seq_min): random_string += random.choice(seq) if char_classes: @@ -189,7 +189,7 @@ class RandomString(resource.Resource): cclass_class = char_class[self.CHARACTER_CLASSES_CLASS] cclass_seq = self._sequences[cclass_class] cclass_min = char_class[self.CHARACTER_CLASSES_MIN] - for i in xrange(cclass_min): + for i in six.moves.xrange(cclass_min): random_string += random.choice(cclass_seq) def random_class_char(): diff --git a/heat/engine/scheduler.py b/heat/engine/scheduler.py index 9479404029..c9013d4d2a 100644 --- a/heat/engine/scheduler.py +++ b/heat/engine/scheduler.py @@ -428,7 +428,7 @@ class DependencyTaskGroup(object): Iterate over all subtasks that are currently running - i.e. they have been started but have not yet completed. """ - running = lambda (k, r): k in self._graph and r.started() + running = lambda k_r: k_r[0] in self._graph and k_r[1].started() return itertools.ifilter(running, six.iteritems(self._runners)) diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py index 85a0106610..ebb211a3c3 100644 --- a/heat/tests/test_heatclient.py +++ b/heat/tests/test_heatclient.py @@ -143,7 +143,7 @@ class KeystoneClientTest(common.HeatTestCase): auth=mock_ks_auth) c.AndReturn(self.mock_ks_v3_client) - for x in xrange(0, times): + for x in six.moves.xrange(0, times): m = mock_ks_auth.get_access(mox.IsA(ks_session.Session)) m.AndReturn(mock_auth_ref) diff --git a/heat/tests/test_swiftsignal.py b/heat/tests/test_swiftsignal.py index 48461ac397..ed9db5155a 100644 --- a/heat/tests/test_swiftsignal.py +++ b/heat/tests/test_swiftsignal.py @@ -381,7 +381,7 @@ class SwiftSignalTest(common.HeatTestCase): time_now = timeutils.utcnow() time_series = [datetime.timedelta(0, t) + time_now - for t in xrange(1, 100)] + for t in six.moves.xrange(1, 100)] timeutils.set_time_override(time_series) self.addCleanup(timeutils.clear_time_override)