Fix double trailing newline apidoc

[AleksaC]

Subject: Fix apidoc generating two newlines at the end of the package rst file if it contains submodules and --module-first is used.

Feature or Bugfix

• Bugfix

Purpose

• Fix apidoc generates an extra newline at the end of the rst file if a module has submodules #7890

[tk0miya]

I think using stripping mark at both start and end causes template maintainable. I guess the change above (changing "else" to independent "if" statement) came from this change, right? To keep templates clean, it is better to use one of them consistently.

How about the change like this?

@@ -43,9 +46,10 @@ Submodules
 {{ automodule(submodule, automodule_options) }}
 {% endfor %}
 {%- endif %}
-{% endif %}
+{%- endif %}

 {%- if not modulefirst and not is_namespace %}
+
 Module contents
 ---------------

Notes:

• Inserts a blank line before section headers to add a space only if the block needed.
• Add stripping-mark to the start of "endif" to strip trailing return codes.

I guess some additional change would be needed for this change. But it will keep our templates clean (if my understanding correct). Could you check this please?

[AleksaC]

Thanks for the feedback. I tried what you suggested, but test_pep_0420_enabled_separate fails as the file lacks newline at the end and there is no clean way to add it. Another problem occurs with modules without submodules where 2 newlines are added before Module contents.

If using - both at the start and the end of the template is a problem it can be moved to the beginning of the next {% endif %}, but even that won't be necessary as I found a way to fix this even without changing else to a separate if statement.

[tk0miya]

Thank you for update. LGTM!