From d8f86fa4d2f2aa3cc6683cdb67ca43769a6eb592 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 27 Mar 2017 11:41:31 -0700 Subject: [PATCH] A couple more places where compat.six was used converted to module_utils.six (#22976) --- CODING_GUIDELINES.md | 2 +- docs/api/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md index 60bf41ea658..0fc49e8ba72 100644 --- a/CODING_GUIDELINES.md +++ b/CODING_GUIDELINES.md @@ -277,7 +277,7 @@ To test if something is a string, consider that it may be unicode. if type(x) == str: # yes - from ansible.compat.six import string_types + from ansible.module_utils.six import string_types if isinstance(x, string_types): Cleverness diff --git a/docs/api/Makefile b/docs/api/Makefile index 67203e43853..c16e455282e 100644 --- a/docs/api/Makefile +++ b/docs/api/Makefile @@ -14,7 +14,7 @@ PAPER = BUILDDIR = _build RSTDIR = rst MODULES_PATH = ../../lib -EXCLUDE_PATHS = ../../lib/ansible/modules ../../lib/ansible/utils/module_docs_fragments ../../lib/ansible/compat/six ../../lib/ansible/module_utils/six.py +EXCLUDE_PATHS = ../../lib/ansible/modules ../../lib/ansible/utils/module_docs_fragments ../../lib/ansible/module_utils/six DOC_PROJECTS = "Ansible API" # User-friendly check for sphinx-build