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

python3: KeyError to use format #96

Merged
merged 1 commit into from
Jul 31, 2014
Merged

python3: KeyError to use format #96

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
8 changes: 4 additions & 4 deletions pyVmomi/VmomiSupport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ def _SetWsdlType(ns, wsdlName, typ):
# @return type if found else throws KeyError
def GetWsdlType(ns, name):
if ns is None or name is None:
raise KeyError("%s %s" % (ns, name))
raise KeyError("{0} {1}".format(ns, name))

with _lazyLock:
# Check if the type is loaded in the map
Expand All @@ -1003,14 +1003,14 @@ def GetWsdlType(ns, name):
try:
return GetWsdlType(ns, name[7:]).Array
except KeyError:
raise KeyError("%s %s" % (ns, name))
raise KeyError("{0} {1}".format(ns, name))
else:
# Type is not loaded yet, load it
typ = _LoadVmodlType(_wsdlDefMap[(ns, name)][0])
if typ:
return typ

raise KeyError("%s %s" % (ns, name))
raise KeyError("{0} {1}".format(ns, name))

## Guess the type from wsdlname with no ns
# WARNING! This should not be used in general, as there is no guarantee for
Expand Down Expand Up @@ -1203,7 +1203,7 @@ def GetWsdlMethod(ns, wsdlName):
LoadManagedType(*method)
return _wsdlMethodMap[(ns, wsdlName)]
else:
raise KeyError("%s %s" % (ns, name))
raise KeyError("{0} {1}".format(ns, name))

## Guess the method from wsdlname with no ns
# WARNING! This should not be used in general, as there is no guarantee for
Expand Down