cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

jenkins_job module: fix for python3 (#54958)

Browse source
This commit is contained in:
Mariusz Kryński 2020-01-19 18:57:54 +01:00 committed by ansibot
parent 4181717af6
commit 3bf8b1d1c9
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/web_infrastructure/jenkins_job.py
View file

@ -20,7 +20,6 @@ description:
- Manage Jenkins jobs by using Jenkins REST API. - Manage Jenkins jobs by using Jenkins REST API.
requirements: requirements:
- "python-jenkins >= 0.4.12" - "python-jenkins >= 0.4.12"
- "lxml >= 3.3.3"
version_added: "2.2" version_added: "2.2"
author: "Sergio Millan Rodriguez (@sermilrod)" author: "Sergio Millan Rodriguez (@sermilrod)"
options: options:
@ -147,6 +146,7 @@ url:
''' '''
import traceback import traceback
import xml.etree.ElementTree as ET
JENKINS_IMP_ERR = None JENKINS_IMP_ERR = None
try: try:
@ -156,14 +156,6 @@ except ImportError:
JENKINS_IMP_ERR = traceback.format_exc() JENKINS_IMP_ERR = traceback.format_exc()
python_jenkins_installed = False python_jenkins_installed = False
LXML_IMP_ERR = None
try:
from lxml import etree as ET
python_lxml_installed = True
except ImportError:
LXML_IMP_ERR = traceback.format_exc()
python_lxml_installed = False
from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
@ -334,14 +326,9 @@ def test_dependencies(module):
url="https://python-jenkins.readthedocs.io/en/latest/install.html"), url="https://python-jenkins.readthedocs.io/en/latest/install.html"),
exception=JENKINS_IMP_ERR) exception=JENKINS_IMP_ERR)
if not python_lxml_installed:
module.fail_json(
msg=missing_required_lib("lxml", url="https://lxml.de/installation.html"),
exception=LXML_IMP_ERR)
def job_config_to_string(xml_str): def job_config_to_string(xml_str):
return ET.tostring(ET.fromstring(xml_str)) return ET.tostring(ET.fromstring(xml_str)).decode('ascii')
def main(): def main():