From e35a5859be074f70d924cd3c13611c3f4fb25ed9 Mon Sep 17 00:00:00 2001
From: tianhao he <tianhao64@gmail.com>
Date: Tue, 19 Apr 2016 11:07:56 -0700
Subject: [PATCH] itertools.izip() is renamed to zip() in python3

In python3, itertools.izip() was changed to zip(). Using six.zip() to
ensure the compatiblity between 2 and 3.
---
 pyVmomi/Differ.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pyVmomi/Differ.py b/pyVmomi/Differ.py
index bc7bfc5f6..f85f9d1a9 100644
--- a/pyVmomi/Differ.py
+++ b/pyVmomi/Differ.py
@@ -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.
@@ -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
 
@@ -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'
@@ -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
@@ -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