Skip to content

Commit

Permalink
itertools.izip() is renamed to zip() in python3
Browse files Browse the repository at this point in the history
In python3, itertools.izip() was changed to zip(). Using six.zip() to
ensure the compatiblity between 2 and 3.
  • Loading branch information
tianhao64 committed Apr 19, 2016
1 parent a205a38 commit e35a585
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions pyVmomi/Differ.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# VMware vSphere Python SDK
# Copyright (c) 2008-2015 VMware, Inc. All Rights Reserved.
# Copyright (c) 2008-2016 VMware, Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -15,11 +15,9 @@

## Diff any two objects
import six
from six import text_type
from six import u
from six.moves import zip

from pyVmomi import VmomiSupport, types
import itertools
import logging
from VmomiSupport import GetWsdlName, Type

Expand Down Expand Up @@ -99,7 +97,7 @@ def DiffDoArrays(self, oldObj, newObj, isElementLinks):
__Log__.debug('DiffDoArrays: Array lengths do not match %d != %d'
% (len(oldObj), len(newObj)))
return False
for i, j in itertools.izip(oldObj, newObj):
for i, j in zip(oldObj, newObj):
if isElementLinks:
if i.GetKey() != j.GetKey():
__Log__.debug('DiffDoArrays: Keys do not match %s != %s'
Expand All @@ -118,7 +116,7 @@ def DiffAnyArrays(self, oldObj, newObj, isElementLinks):
__Log__.debug('DiffAnyArrays: Array lengths do not match. %d != %d'
% (len(oldObj), len(newObj)))
return False
for i, j in itertools.izip(oldObj, newObj):
for i, j in zip(oldObj, newObj):
if not self.DiffAnyObjects(i, j, isElementLinks):
__Log__.debug('DiffAnyArrays: One of the elements do not match.')
return False
Expand All @@ -136,7 +134,7 @@ def DiffPrimitiveArrays(self, oldObj, newObj):
newSet = newObj and frozenset(newObj) or frozenset()
match = (oldSet == newSet)
else:
for i, j in itertools.izip(oldObj, newObj):
for i, j in zip(oldObj, newObj):
if i != j:
match = False
break
Expand Down

0 comments on commit e35a585

Please sign in to comment.