From 6d4c917440793e988b907a62f2f56f5dc82b53dd Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mar 30 2017 11:08:08 +0000 Subject: Use with statement for opening file Signed-off-by: Abhijeet Kasurde Reviewed-By: Martin Basti --- diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py index e7ba867..d409efb 100644 --- a/ipatests/test_ipaserver/test_ldap.py +++ b/ipatests/test_ipaserver/test_ldap.py @@ -88,9 +88,8 @@ class test_ldap(object): """ pwfile = api.env.dot_ipa + os.sep + ".dmpw" if ipautil.file_exists(pwfile): - fp = open(pwfile, "r") - dm_password = fp.read().rstrip() - fp.close() + with open(pwfile, "r") as fp: + dm_password = fp.read().rstrip() else: raise nose.SkipTest("No directory manager password in %s" % pwfile) self.conn = ldap2(api, ldap_uri=self.ldapuri) @@ -115,9 +114,8 @@ class test_ldap(object): pwfile = api.env.dot_ipa + os.sep + ".dmpw" if ipautil.file_exists(pwfile): - fp = open(pwfile, "r") - dm_password = fp.read().rstrip() - fp.close() + with open(pwfile, "r") as fp: + dm_password = fp.read().rstrip() else: raise nose.SkipTest("No directory manager password in %s" % pwfile) myapi.Backend.ldap2.connect(bind_dn=DN(('cn', 'Directory Manager')), bind_pw=dm_password) diff --git a/ipatests/test_pkcs10/test_pkcs10.py b/ipatests/test_pkcs10/test_pkcs10.py index 850ed91..df50df0 100644 --- a/ipatests/test_pkcs10/test_pkcs10.py +++ b/ipatests/test_pkcs10/test_pkcs10.py @@ -41,9 +41,8 @@ class test_update(object): raise nose.SkipTest("Unable to find test update files") def read_file(self, filename): - fp = open(os.path.join(self.testdir, filename), "r") - data = fp.read() - fp.close() + with open(os.path.join(self.testdir, filename), "r") as fp: + data = fp.read() return data def test_0(self): diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py index 0b8277b..51c20b6 100644 --- a/ipatests/test_xmlrpc/test_cert_plugin.py +++ b/ipatests/test_xmlrpc/test_cert_plugin.py @@ -103,9 +103,8 @@ class BaseCert(XMLRPC_test): self.certfile = self.reqdir + "/cert.crt" # Create an empty password file - fp = open(self.pwname, "w") - fp.write("\n") - fp.close() + with open(self.pwname, "w") as fp: + fp.write("\n") # Create our temporary NSS database self.run_certutil(["-N", "-f", self.pwname]) @@ -122,9 +121,8 @@ class BaseCert(XMLRPC_test): "-f", self.pwname, "-a", ]) - fp = open(self.reqfile, "r") - data = fp.read() - fp.close() + with open(self.reqfile, "r") as fp: + data = fp.read() return data host_fqdn = u'ipatestcert.%s' % api.env.domain