summaryrefslogtreecommitdiffstats
path: root/jenkins_jobs/builder.py
diff options
context:
space:
mode:
authorKhai Do <zaro0508@gmail.com>2015-10-09 13:03:45 -0700
committerKhai Do <zaro0508@gmail.com>2015-10-13 00:26:20 -0700
commit899bc6c946030b0f3ddbe591e1dc6dd0af99eafb (patch)
tree29677f2c6ec7f8611af7060abcee1c6326ed8ee2 /jenkins_jobs/builder.py
parent4672157c05987225fbb1e61332306330090039f5 (diff)
downloadpython-jenkins-job-builder-899bc6c946030b0f3ddbe591e1dc6dd0af99eafb.tar.gz
python-jenkins-job-builder-899bc6c946030b0f3ddbe591e1dc6dd0af99eafb.tar.xz
python-jenkins-job-builder-899bc6c946030b0f3ddbe591e1dc6dd0af99eafb.zip
fix for python 3, decode job output
Change Ie952617a34c0719e forced utf-8 format but forgot to decode the xml when passing to update_job. This broke jjb for python 3: File "/Users/khaido/PycharmProjects/jenkins-job-builder /jenkins_jobs/builder.py", line 134, in update_job self.jenkins.create_job(job_name, xml) File "/Users/khaido/PycharmProjects/jenkins-job-builder/.tox /py34/lib/python3.4/site-packages/jenkins/__init__.py", line 852, in create_job config_xml.encode('utf-8'), DEFAULT_HEADERS)) AttributeError: 'function' object has no attribute 'encode' Change-Id: Iceda46214bf4709ccd8141ef654cf3ec81e8af06
Diffstat (limited to 'jenkins_jobs/builder.py')
-rw-r--r--jenkins_jobs/builder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/jenkins_jobs/builder.py b/jenkins_jobs/builder.py
index c48d280f..0da3b57a 100644
--- a/jenkins_jobs/builder.py
+++ b/jenkins_jobs/builder.py
@@ -352,7 +352,7 @@ class Builder(object):
self.cache.set(job.name, old_md5)
if self.cache.has_changed(job.name, md5) or self.ignore_cache:
- self.jenkins.update_job(job.name, job.output())
+ self.jenkins.update_job(job.name, job.output().decode('utf-8'))
updated_jobs += 1
self.cache.set(job.name, md5)
else: