diff options
| author | Wayne Warren <waynr+launchpad@sdf.org> | 2016-01-03 21:22:40 -0800 |
|---|---|---|
| committer | Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-08-20 01:24:49 -0400 |
| commit | c80e3bc5e9af1001a8227ac1e9ff8905ac5e17b8 (patch) | |
| tree | a294eaf0f64179bd73d7bbb89dbaf4091aefee40 /jenkins_jobs/config.py | |
| parent | 0a8928f51ac5b74553e42bca365175bd4488b13d (diff) | |
| download | python-jenkins-job-builder-c80e3bc5e9af1001a8227ac1e9ff8905ac5e17b8.tar.gz python-jenkins-job-builder-c80e3bc5e9af1001a8227ac1e9ff8905ac5e17b8.tar.xz python-jenkins-job-builder-c80e3bc5e9af1001a8227ac1e9ff8905ac5e17b8.zip | |
Cleanup various deprecation warnings.
Change-Id: Iec16a5965d62bebb50d3e7307ab93c59304a9ab6
Diffstat (limited to 'jenkins_jobs/config.py')
| -rw-r--r-- | jenkins_jobs/config.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/jenkins_jobs/config.py b/jenkins_jobs/config.py index a494bc4c..9bbdbb74 100644 --- a/jenkins_jobs/config.py +++ b/jenkins_jobs/config.py @@ -21,6 +21,7 @@ import logging import os from six.moves import configparser, StringIO +from six import PY2 from jenkins_jobs import builder from jenkins_jobs.errors import JJBConfigException @@ -116,7 +117,10 @@ class JJBConfig(object): "config values.".format(conf)) if config_fp is not None: - config_parser.readfp(config_fp) + if PY2: + config_parser.readfp(config_fp) + else: + config_parser.read_file(config_fp) self.config_parser = config_parser @@ -140,7 +144,10 @@ class JJBConfig(object): """ config = configparser.ConfigParser() # Load default config always - config.readfp(StringIO(DEFAULT_CONF)) + if PY2: + config.readfp(StringIO(DEFAULT_CONF)) + else: + config.read_file(StringIO(DEFAULT_CONF)) return config def _read_config_file(self, config_filename): |