You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/12/21 15:14:28 UTC
[6/6] git commit: Fix test failure in Python 2.5;
enumerate in 2.5 doesn't support start argument.
Fix test failure in Python 2.5; enumerate in 2.5 doesn't support start argument.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2311fda1
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2311fda1
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2311fda1
Branch: refs/heads/trunk
Commit: 2311fda184ae5bc03a6856560ee0da20d714f997
Parents: 20ed92e
Author: Tomaz Muraus <to...@apache.org>
Authored: Sat Dec 21 15:09:16 2013 +0100
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sat Dec 21 15:10:55 2013 +0100
----------------------------------------------------------------------
libcloud/compute/drivers/ec2.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/2311fda1/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 7083453..90fc864 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -2241,7 +2241,9 @@ class BaseEC2NodeDriver(NodeDriver):
if cidr_ips is not None:
ip_ranges = {}
- for index, cidr_ip in enumerate(cidr_ips, 1):
+ for index, cidr_ip in enumerate(cidr_ips):
+ index += 1
+
ip_ranges['IpPermissions.1.IpRanges.%s.CidrIp'
% (index)] = cidr_ip
@@ -2249,7 +2251,9 @@ class BaseEC2NodeDriver(NodeDriver):
if group_pairs is not None:
user_groups = {}
- for index, group_pair in enumerate(group_pairs, 1):
+ for index, group_pair in enumerate(group_pairs):
+ index += 1
+
if 'group_id' in group_pair.keys():
user_groups['IpPermissions.1.Groups.%s.GroupId'
% (index)] = group_pair['group_id']