diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-15 19:00:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-15 19:00:56 +0000 |
| commit | a1eb48e9397d054e57a06d9f93adf06d4d6784f6 (patch) | |
| tree | 00724a88589d004659c1d38bb2ea50e23d15f30a | |
| parent | 7a3974dfabcf0fa86a75ac6950e5136fd0a851a2 (diff) | |
| parent | 1e901d921db174d897d8732e9394f07effdad20d (diff) | |
| download | python-jenkins-job-builder-a1eb48e9397d054e57a06d9f93adf06d4d6784f6.tar.gz python-jenkins-job-builder-a1eb48e9397d054e57a06d9f93adf06d4d6784f6.tar.xz python-jenkins-job-builder-a1eb48e9397d054e57a06d9f93adf06d4d6784f6.zip | |
Merge "Avoid ResourceWarning by closing file handlers when finished"
| -rw-r--r-- | jenkins_jobs/config.py | 3 | ||||
| -rw-r--r-- | tests/base.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/jenkins_jobs/config.py b/jenkins_jobs/config.py index 6f146c19..2252392b 100644 --- a/jenkins_jobs/config.py +++ b/jenkins_jobs/config.py @@ -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 """ diff --git a/tests/base.py b/tests/base.py index 514b83c4..b239f64e 100644 --- a/tests/base.py +++ b/tests/base.py @@ -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): |