openstack/deb-python-pyvmomi
Code Issues Proposed changes

Merge pull request #382 from tianhao64/master

Browse Source 
Python3 fix for differ.py
This commit is contained in:
Tianhao He 2016-04-19 11:11:25 -07:00
commit 1933c122a2
2 changed files with 6 additions and 8 deletions

2
pyVim/connect.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.

12
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 @@ class Differ:
__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 @@ class Differ:
__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 @@ class Differ:
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