Merge doc fragments in earlier (#52193)

* Merge doc fragments in earlier

* Move it even higher

* Remove errant docs key

* Fix type
This commit is contained in:
Matt Martz 2019-02-19 09:02:12 -06:00 committed by GitHub
parent 19f069c041
commit b54086ef02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View file

@ -985,6 +985,8 @@ class ModuleValidator(Validator):
msg='Unknown DOCUMENTATION error, see TRACE: %s' % e
)
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
if 'options' in doc and doc['options'] is None:
self.reporter.error(
path=self.object_path,
@ -1005,8 +1007,6 @@ class ModuleValidator(Validator):
# This is the normal case
self._validate_docs_schema(doc, doc_schema(self.object_name.split('.')[0]), 'DOCUMENTATION', 305)
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
existing_doc = self._check_for_new_args(doc, metadata)
self._check_version_added(doc, existing_doc)