openstack/deb-python-pyvmomi
Code Issues Proposed changes

Properly close file in GetLocalTicket

Browse Source 
The function GetLocalTicket is opening a file but never closes it, resulting
in warnings such as:
> /lib64/python3.4/site-packages/pyVim/connect.py:258:
> ResourceWarning: unclosed file <_io.TextIOWrapper
> name='/var/run/vmware-hostd-ticket/5272a616-e23e-e380-f519-464675de47d2'
> mode='r' encoding='UTF-8'>
on Python 3.

 Please enter the commit message for your changes. Lines starting
This commit is contained in:
tianhao he 2016-04-19 10:49:28 -07:00
parent 9f2acf8ece
commit bab12c6061
1 changed files with 8 additions and 6 deletions

14
pyVim/connect.py

@ -113,7 +113,7 @@ class VimSessionOrientedStub(SessionOrientedStub):
assert(stsUrl)
def _doLogin(soapStub):
import sso
from . import sso
cert = soapStub.schemeArgs['cert_file']
key = soapStub.schemeArgs['key_file']
authenticator = sso.SsoAuthenticator(sts_url=stsUrl,
@ -156,7 +156,7 @@ class VimSessionOrientedStub(SessionOrientedStub):
assert(stsUrl)
def _doLogin(soapStub):
import sso
from . import sso
cert = soapStub.schemeArgs['cert_file']
key = soapStub.schemeArgs['key_file']
authenticator = sso.SsoAuthenticator(sts_url=stsUrl,
@ -279,7 +279,9 @@ def GetLocalTicket(si, user):
msg = 'Failed to query for local ticket: "%s"' % e
raise vim.fault.HostConnectFault(msg=msg)
localTicket = sessionManager.AcquireLocalTicket(userName=user)
return (localTicket.userName, file(localTicket.passwordFilePath).read())
with open(localTicket.passwordFilePath) as f:
content = f.read()
return localTicket.userName, content
## Private method that performs the actual Connect and returns a
@ -798,12 +800,12 @@ def OpenPathWithStub(path, stub):
it is included with the HTTP request. Returns the response as a
file-like object.
"""
import httplib
from six.moves import http_client
if not hasattr(stub, 'scheme'):
raise vmodl.fault.NotSupported()
elif stub.scheme == httplib.HTTPConnection:
elif stub.scheme == http_client.HTTPConnection:
protocol = 'http'
elif stub.scheme == httplib.HTTPSConnection:
elif stub.scheme == http_client.HTTPSConnection:
protocol = 'https'
else:
raise vmodl.fault.NotSupported()