Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for Python 3 with 2to3 #66

Closed
wants to merge 1 commit into from
Closed

Fixes for Python 3 with 2to3 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pyVim/connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,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:
Expand Down Expand Up @@ -256,7 +256,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)
Expand Down Expand Up @@ -312,7 +312,7 @@ def __Login(host, port, user, pwd, service, adapter, version, path,
content = si.RetrieveContent()
except vmodl.MethodFault:
raise
except Exception, e:
except Exception as e:
raise vim.fault.HostConnectFault(msg=str(e))

# Get a ticket if we're connecting to localhost and password is not specified
Expand All @@ -328,7 +328,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

Expand All @@ -344,7 +344,7 @@ def __Logout(si):
if si:
content = si.RetrieveContent()
content.sessionManager.Logout()
except Exception, e:
except Exception as e:
pass


Expand Down Expand Up @@ -467,7 +467,7 @@ def __VersionIsSupported(desiredVersion, serviceVersionDescription):
root = serviceVersionDescription.getroot()
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]
Expand Down
4 changes: 2 additions & 2 deletions pyVmomi/DynamicTypeManagerHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def GetTypeManager(self):
if self.hostSystem:
try:
dynTypeMgr = self.hostSystem.RetrieveDynamicTypeManager()
except vmodl.fault.MethodNotFound, err:
except vmodl.fault.MethodNotFound as err:
pass

if not dynTypeMgr:
Expand Down Expand Up @@ -139,7 +139,7 @@ def _CreateAllTypes(self, enumTypes, dataTypes, managedTypes):
for typeInfo in infos:
try:
fn(*typeInfo)
except Exception, err:
except Exception as err:
#Ignore errors due to duplicate importing
pass

Expand Down
14 changes: 7 additions & 7 deletions pyVmomi/Iso8601.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def ParseISO8601(datetimeStr):
datetimeVal = datetime(**dt)
if delta:
datetimeVal += delta
except Exception, e:
except Exception as e:
pass
return datetimeVal

Expand Down Expand Up @@ -253,7 +253,7 @@ def ISO8601Format(dt):
]:
dt = ParseISO8601(testStr)
if dt == None:
print 'Failed to parse (%s)' % testStr
print('Failed to parse (%s)' % testStr)
assert(False)

# Make sure we can translate back
Expand All @@ -262,16 +262,16 @@ def ISO8601Format(dt):
if dt.tzinfo is None:
dt = dt.replace(tzinfo=dt1.tzinfo)
if dt1 != dt:
print 'ParseISO8601 -> ISO8601Format -> ParseISO8601 failed (%s)' % testStr
print('ParseISO8601 -> ISO8601Format -> ParseISO8601 failed (%s)' % testStr)
assert(False)

# Make sure we can parse python isoformat()
dt2 = ParseISO8601(dt.isoformat())
if dt2 == None:
print 'ParseISO8601("%s".isoformat()) failed' % testStr
print('ParseISO8601("%s".isoformat()) failed' % testStr)
assert(False)

print testStr, '->', dt, isoformat
print(testStr, '->', dt, isoformat)

# Basic form
for testStr in [
Expand All @@ -293,7 +293,7 @@ def ISO8601Format(dt):
# Reject for now
dt = ParseISO8601(testStr)
if dt != None:
print 'ParseISO8601 (%s) should fail, but it did not' % testStr
print('ParseISO8601 (%s) should fail, but it did not' % testStr)
assert(False)
#print testStr, '->', dt
#assert(dt != None)
Expand Down Expand Up @@ -352,5 +352,5 @@ def ISO8601Format(dt):
]:
dt = ParseISO8601(testStr)
if dt != None:
print 'ParseISO8601 (%s) should fail, but it did not' % testStr
print('ParseISO8601 (%s) should fail, but it did not' % testStr)
assert(False)