jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Avoid ResourceWarning by closing file handlers when finished"

Browse Source
This commit is contained in:
Zuul 2019-08-15 19:00:56 +00:00 committed by Gerrit Code Review
commit a1eb48e939
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins_jobs/config.py
View File

@ -141,6 +141,9 @@ class JJBConfig(object):
self._setup()
self._handle_deprecated_hipchat_config()
if config_fp is not None:
config_fp.close()
def _init_defaults(self):
""" Initialize default configuration values using DEFAULT_CONF
"""

3
tests/base.py
View File

@ -137,7 +137,8 @@ class BaseTestCase(testtools.TestCase):
# Read XML content, assuming it is unicode encoded
xml_content = ""
for f in sorted(self.out_filenames):
xml_content += u"%s" % io.open(f, 'r', encoding='utf-8').read()
with io.open(f, 'r', encoding='utf-8') as xml_file:
xml_content += u"%s" % xml_file.read()
return xml_content
def _read_yaml_content(self, filename):