From 4fba9bf23b6d41d397c74354c7b65bed6d39e456 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 25 Jul 2017 16:33:30 -0400 Subject: [PATCH] revert action loader changes to doc, due to error restoring behaviour in which a missing module is a warning that shows paths searched, patch incorrectly bypassed detection and ended up in an exception: global name 'module' is not defined --- lib/ansible/cli/doc.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index 99a275e697..7f9ba3f2f6 100644 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -124,8 +124,6 @@ class DocCLI(CLI): try: # if the plugin lives in a non-python file (eg, win_X.ps1), require the corresponding python file for docs filename = loader.find_plugin(plugin, mod_type='.py', ignore_deprecated=True) - if filename is None and loader == module_loader: - filename = action_loader.find_plugin(module, mod_type='.py') if filename is None: display.warning("%s %s not found in %s\n" % (plugin_type, plugin, DocCLI.print_paths(loader))) continue @@ -219,8 +217,6 @@ class DocCLI(CLI): # if the module lives in a non-python file (eg, win_X.ps1), require the corresponding python file for docs filename = loader.find_plugin(plugin, mod_type='.py', ignore_deprecated=True) - if filename is None and loader == module_loader: - filename = action_loader.find_plugin(module, mod_type='.py') if filename is None: continue if filename.endswith(".ps1"):