a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CI and jenkins_plugin module (#202) 

* Don't import text_type and binary_type from ansible.module_utils._text, but from ansible.module_utils.six.

* Add changelog fragment.
pull/205/head
Felix Fontein 2020-04-17 20:46:51 +02:00 committed by GitHub
parent 0c0490298f
commit 2eee9f78a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/202-jenkins_plugin-fix-import.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- jenkins_plugin - make compatible to Ansible 2.10 by fixing import.

3
plugins/modules/web_infrastructure/jenkins_plugin.py
View File

@ -266,7 +266,8 @@ from ansible.module_utils.basic import AnsibleModule, to_bytes
from ansible.module_utils.six.moves import http_cookiejar as cookiejar from ansible.module_utils.six.moves import http_cookiejar as cookiejar
from ansible.module_utils.six.moves.urllib.parse import urlencode from ansible.module_utils.six.moves.urllib.parse import urlencode
from ansible.module_utils.urls import fetch_url, url_argument_spec from ansible.module_utils.urls import fetch_url, url_argument_spec
from ansible.module_utils._text import to_native, text_type, binary_type from ansible.module_utils.six import text_type, binary_type
from ansible.module_utils._text import to_native
import base64 import base64
import hashlib import hashlib
import json import json