Merge "Optimize "open" method with context manager"
This commit is contained in:
commit
8dd27d3368
@ -135,9 +135,8 @@ class BaseCertificateConfigure(object):
|
|||||||
user=self.use_keystone_user,
|
user=self.use_keystone_user,
|
||||||
group=self.use_keystone_group, log=LOG)
|
group=self.use_keystone_group, log=LOG)
|
||||||
if not file_exists(self.ssl_config_file_name):
|
if not file_exists(self.ssl_config_file_name):
|
||||||
ssl_config_file = open(self.ssl_config_file_name, 'w')
|
with open(self.ssl_config_file_name, 'w') as ssl_config_file:
|
||||||
ssl_config_file.write(self.sslconfig % self.ssl_dictionary)
|
ssl_config_file.write(self.sslconfig % self.ssl_dictionary)
|
||||||
ssl_config_file.close()
|
|
||||||
utils.set_permissions(self.ssl_config_file_name,
|
utils.set_permissions(self.ssl_config_file_name,
|
||||||
mode=PRIVATE_FILE_PERMS,
|
mode=PRIVATE_FILE_PERMS,
|
||||||
user=self.use_keystone_user,
|
user=self.use_keystone_user,
|
||||||
@ -145,9 +144,8 @@ class BaseCertificateConfigure(object):
|
|||||||
|
|
||||||
index_file_name = os.path.join(self.conf_dir, 'index.txt')
|
index_file_name = os.path.join(self.conf_dir, 'index.txt')
|
||||||
if not file_exists(index_file_name):
|
if not file_exists(index_file_name):
|
||||||
index_file = open(index_file_name, 'w')
|
with open(index_file_name, 'w') as index_file:
|
||||||
index_file.write('')
|
index_file.write('')
|
||||||
index_file.close()
|
|
||||||
utils.set_permissions(index_file_name,
|
utils.set_permissions(index_file_name,
|
||||||
mode=PRIVATE_FILE_PERMS,
|
mode=PRIVATE_FILE_PERMS,
|
||||||
user=self.use_keystone_user,
|
user=self.use_keystone_user,
|
||||||
@ -155,9 +153,8 @@ class BaseCertificateConfigure(object):
|
|||||||
|
|
||||||
serial_file_name = os.path.join(self.conf_dir, 'serial')
|
serial_file_name = os.path.join(self.conf_dir, 'serial')
|
||||||
if not file_exists(serial_file_name):
|
if not file_exists(serial_file_name):
|
||||||
index_file = open(serial_file_name, 'w')
|
with open(serial_file_name, 'w') as index_file:
|
||||||
index_file.write('01')
|
index_file.write('01')
|
||||||
index_file.close()
|
|
||||||
utils.set_permissions(serial_file_name,
|
utils.set_permissions(serial_file_name,
|
||||||
mode=PRIVATE_FILE_PERMS,
|
mode=PRIVATE_FILE_PERMS,
|
||||||
user=self.use_keystone_user,
|
user=self.use_keystone_user,
|
||||||
|
@ -49,16 +49,14 @@ class Auth(controller.V2Controller):
|
|||||||
|
|
||||||
@controller.v2_deprecated
|
@controller.v2_deprecated
|
||||||
def ca_cert(self, context, auth=None):
|
def ca_cert(self, context, auth=None):
|
||||||
ca_file = open(CONF.signing.ca_certs, 'r')
|
with open(CONF.signing.ca_certs, 'r') as ca_file:
|
||||||
data = ca_file.read()
|
data = ca_file.read()
|
||||||
ca_file.close()
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@controller.v2_deprecated
|
@controller.v2_deprecated
|
||||||
def signing_cert(self, context, auth=None):
|
def signing_cert(self, context, auth=None):
|
||||||
cert_file = open(CONF.signing.certfile, 'r')
|
with open(CONF.signing.certfile, 'r') as cert_file:
|
||||||
data = cert_file.read()
|
data = cert_file.read()
|
||||||
cert_file.close()
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@controller.v2_deprecated
|
@controller.v2_deprecated
|
||||||
|
Loading…
x
Reference in New Issue
Block a user