openstack/deb-python-pyvmomi
Code Issues Proposed changes

Merge pull request #369 from tianhao64/master

Browse Source 
Fix python3 error when evaluating if obj is primitive type
This commit is contained in:
Tianhao He
2016-03-21 22:47:05 -07:00
parent 9affe3e9ab d3055ea965
commit 888bf2c422
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyVmomi/Differ.py
View File

@@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
## Diff any two objects ## Diff any two objects
import six
from six import text_type from six import text_type
from six import u from six import u
@@ -32,10 +33,9 @@ def LogIf(condition, message):
def IsPrimitiveType(obj): def IsPrimitiveType(obj):
"""See if the passed in type is a Primitive Type""" """See if the passed in type is a Primitive Type"""
return (isinstance(obj, types.bool) or isinstance(obj, types.byte) or return (isinstance(obj, types.bool) or isinstance(obj, types.byte) or
isinstance(obj, types.short) or isinstance(obj, types.int) or isinstance(obj, types.short) or isinstance(obj, six.integer_types) or
isinstance(obj, types.double) or isinstance(obj, types.float) or isinstance(obj, types.double) or isinstance(obj, types.float) or
isinstance(obj, types.long) or isinstance(obj, types.str) or isinstance(obj, six.string_types) or
isinstance(obj, text_type) or
isinstance(obj, types.PropertyPath) or isinstance(obj, types.PropertyPath) or
isinstance(obj, types.ManagedMethod) or isinstance(obj, types.ManagedMethod) or
isinstance(obj, types.datetime) or isinstance(obj, types.datetime) or