From 170ea1dece16429cabc8b51f387e7eaa17aecd4c Mon Sep 17 00:00:00 2001
From: Yuya Kusakabe <yuya.kusakabe@gmail.com>
Date: Thu, 26 Jun 2014 09:58:34 +0900
Subject: [PATCH] python3: 2to3 tool
Fixes for Python 3 with 2to3
partial https://github.com/vmware/pyvmomi/issues/55
---
pyVim/connect.py | 10 +++++-----
pyVmomi/DynamicTypeManagerHelper.py | 4 ++--
pyVmomi/Iso8601.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pyVim/connect.py b/pyVim/connect.py
index e06274d..10637aa 100644
--- a/pyVim/connect.py
+++ b/pyVim/connect.py
@@ -222,7 +222,7 @@ def Connect(host='localhost', port=443, user='root', pwd='',
host = info.group(1)[1:-1]
if info.group(2) is not None:
port = int(info.group(2)[1:])
- except ValueError, ve:
+ except ValueError as ve:
pass
if namespace:
@@ -251,7 +251,7 @@ def Disconnect(si):
def GetLocalTicket(si, user):
try:
sessionManager = si.content.sessionManager
- except Exception, e:
+ except Exception as e:
if type(e).__name__ == 'ExpatError':
msg = 'Malformed response while querying for local ticket: "%s"' % e
raise vim.fault.HostConnectFault(msg=msg)
@@ -329,7 +329,7 @@ def __Login(host, port, user, pwd, service, adapter, version, path,
x = content.sessionManager.Login(user, pwd, None)
except vim.fault.InvalidLogin:
raise
- except Exception, e:
+ except Exception as e:
raise
return si, stub
@@ -345,7 +345,7 @@ def __Logout(si):
if si:
content = si.RetrieveContent()
content.sessionManager.Logout()
- except Exception, e:
+ except Exception as e:
pass
@@ -465,7 +465,7 @@ def __VersionIsSupported(desiredVersion, serviceVersionDescription):
root = serviceVersionDescription
if root.tag == 'namespaces':
# serviceVersionDescription appears to be a vimServiceVersions.xml document
- if root.get('version') <> '1.0':
+ if root.get('version') != '1.0':
raise RuntimeError('vimServiceVersions.xml has version %s,' \
' which is not understood' % (root.get('version')))
desiredVersionId = versionIdMap[desiredVersion]
diff --git a/pyVmomi/DynamicTypeManagerHelper.py b/pyVmomi/DynamicTypeManagerHelper.py
index dbd3559..459da95 100644
--- a/pyVmomi/DynamicTypeManagerHelper.py
+++ b/pyVmomi/DynamicTypeManagerHelper.py
@@ -45,7 +45,7 @@ class DynamicTypeImporter:
if self.hostSystem:
try:
dynTypeMgr = self.hostSystem.RetrieveDynamicTypeManager()
- except vmodl.fault.MethodNotFound, err:
+ except vmodl.fault.MethodNotFound as err:
pass
if not dynTypeMgr:
@@ -139,7 +139,7 @@ class DynamicTypeConstructor:
for typeInfo in infos:
try:
fn(*typeInfo)
- except Exception, err:
+ except Exception as err:
#Ignore errors due to duplicate importing
pass
diff --git a/pyVmomi/Iso8601.py b/pyVmomi/Iso8601.py
index 19a66d4..9b90870 100644
--- a/pyVmomi/Iso8601.py
+++ b/pyVmomi/Iso8601.py
@@ -177,7 +177,7 @@ def ParseISO8601(datetimeStr):
datetimeVal = datetime(**dt)
if delta:
datetimeVal += delta
- except Exception, e:
+ except Exception as e:
pass
return datetimeVal