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

Python 3 fixes for ansible-doc.

Browse source
This commit is contained in:
Matt Clay 2016-11-03 15:46:12 -07:00 committed by Toshio Kuratomi
parent b18263cf36
commit 88dbb5a630
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/cli/doc.py
View file

@ -101,7 +101,7 @@ class DocCLI(CLI):
try:
doc, plainexamples, returndocs = module_docs.get_docstring(filename, verbose=(self.options.verbosity > 0))
except:
display.vvv(traceback.print_exc())
display.vvv(traceback.format_exc())
display.error("module %s has a documentation error formatting or is missing documentation\nTo see exact traceback use -vvv" % module)
continue
@ -134,7 +134,7 @@ class DocCLI(CLI):
# probably a quoting issue.
raise AnsibleError("Parsing produced an empty object.")
except Exception as e:
display.vvv(traceback.print_exc())
display.vvv(traceback.format_exc())
raise AnsibleError("module %s missing documentation (or could not parse documentation): %s\n" % (module, str(e)))
if text:

6
lib/ansible/utils/module_docs.py
View file

@ -97,10 +97,10 @@ def get_docstring(filename, verbose=False):
fragment_yaml = getattr(fragment_class, fragment_var, '{}')
fragment = AnsibleLoader(fragment_yaml, file_name=filename).get_single_data()
if fragment.has_key('notes'):
if 'notes' in fragment:
notes = fragment.pop('notes')
if notes:
if not doc.has_key('notes'):
if 'notes' not in doc:
doc['notes'] = []
doc['notes'].extend(notes)
@ -108,7 +108,7 @@ def get_docstring(filename, verbose=False):
raise Exception("missing options in fragment, possibly misformatted?")
for key, value in fragment.items():
if not doc.has_key(key):
if key not in doc:
doc[key] = value
else:
if isinstance(doc[key], MutableMapping):