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

Pep8 fixes for jenkins_* module (#24154)

Browse source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-05-01 20:31:25 +05:30 committed by Matt Martz
parent d088030fa6
commit cdca648f15
3 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,9 @@ try:
except ImportError: except ImportError:
python_lxml_installed = False python_lxml_installed = False
class JenkinsJob: class JenkinsJob:
def __init__(self, module): def __init__(self, module):
self.module = module self.module = module
@ -328,18 +330,21 @@ class JenkinsJob:
result['enabled'] = None result['enabled'] = None
return result return result
def test_dependencies(module): def test_dependencies(module):
if not python_jenkins_installed: if not python_jenkins_installed:
module.fail_json(msg="python-jenkins required for this module. "\ module.fail_json(msg="python-jenkins required for this module. "
"see http://python-jenkins.readthedocs.io/en/latest/install.html") "see http://python-jenkins.readthedocs.io/en/latest/install.html")
if not python_lxml_installed: if not python_lxml_installed:
module.fail_json(msg="lxml required for this module. "\ module.fail_json(msg="lxml required for this module. "
"see http://lxml.de/installation.html") "see http://lxml.de/installation.html")
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))
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(

6
lib/ansible/modules/web_infrastructure/jenkins_script.py
View file

@ -127,6 +127,7 @@ except ImportError:
# python3 # python3
from urllib.parse import urlencode from urllib.parse import urlencode
def is_csrf_protection_enabled(module): def is_csrf_protection_enabled(module):
resp, info = fetch_url(module, resp, info = fetch_url(module,
module.params['url'] + '/api/json', module.params['url'] + '/api/json',
@ -137,6 +138,7 @@ def is_csrf_protection_enabled(module):
content = resp.read() content = resp.read()
return json.loads(content).get('useCrumbs', False) return json.loads(content).get('useCrumbs', False)
def get_crumb(module): def get_crumb(module):
resp, info = fetch_url(module, resp, info = fetch_url(module,
module.params['url'] + '/crumbIssuer/api/json', module.params['url'] + '/crumbIssuer/api/json',
@ -147,6 +149,7 @@ def get_crumb(module):
content = resp.read() content = resp.read()
return json.loads(content) return json.loads(content)
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
@ -160,7 +163,6 @@ def main():
) )
) )
if module.params['user'] is not None: if module.params['user'] is not None:
if module.params['password'] is None: if module.params['password'] is None:
module.fail_json(msg="password required when user provided") module.fail_json(msg="password required when user provided")
@ -168,7 +170,6 @@ def main():
module.params['url_password'] = module.params['password'] module.params['url_password'] = module.params['password']
module.params['force_basic_auth'] = True module.params['force_basic_auth'] = True
if module.params['args'] is not None: if module.params['args'] is not None:
from string import Template from string import Template
script_contents = Template(module.params['script']).substitute(module.params['args']) script_contents = Template(module.params['script']).substitute(module.params['args'])
@ -199,6 +200,5 @@ def main():
) )
if __name__ == '__main__': if __name__ == '__main__':
main() main()

2
test/sanity/pep8/legacy-files.txt
View file

@ -781,8 +781,6 @@ lib/ansible/modules/web_infrastructure/django_manage.py
lib/ansible/modules/web_infrastructure/ejabberd_user.py lib/ansible/modules/web_infrastructure/ejabberd_user.py
lib/ansible/modules/web_infrastructure/htpasswd.py lib/ansible/modules/web_infrastructure/htpasswd.py
lib/ansible/modules/web_infrastructure/jboss.py lib/ansible/modules/web_infrastructure/jboss.py
lib/ansible/modules/web_infrastructure/jenkins_job.py
lib/ansible/modules/web_infrastructure/jenkins_script.py
lib/ansible/modules/web_infrastructure/jira.py lib/ansible/modules/web_infrastructure/jira.py
lib/ansible/modules/web_infrastructure/letsencrypt.py lib/ansible/modules/web_infrastructure/letsencrypt.py
lib/ansible/modules/windows/win_disk_image.py lib/ansible/modules/windows/win_disk_image.py