From 2eee9f78a69f5dcb5798a904a7a565d1ddaf4f39 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 17 Apr 2020 20:46:51 +0200 Subject: [PATCH] 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. --- changelogs/fragments/202-jenkins_plugin-fix-import.yml | 2 ++ plugins/modules/web_infrastructure/jenkins_plugin.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/202-jenkins_plugin-fix-import.yml diff --git a/changelogs/fragments/202-jenkins_plugin-fix-import.yml b/changelogs/fragments/202-jenkins_plugin-fix-import.yml new file mode 100644 index 0000000000..610d2065e0 --- /dev/null +++ b/changelogs/fragments/202-jenkins_plugin-fix-import.yml @@ -0,0 +1,2 @@ +bugfixes: +- jenkins_plugin - make compatible to Ansible 2.10 by fixing import. diff --git a/plugins/modules/web_infrastructure/jenkins_plugin.py b/plugins/modules/web_infrastructure/jenkins_plugin.py index 62d626f73f..a80980a9ed 100644 --- a/plugins/modules/web_infrastructure/jenkins_plugin.py +++ b/plugins/modules/web_infrastructure/jenkins_plugin.py @@ -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.urllib.parse import urlencode 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 hashlib import json