Sphinx v8 compatibility: separate the names of two mutually-shadowing variables whose types have diverged

[jayaddison]

The values of these key variables would have clobbered each other in the past; their value is not used in subsequent code, however, so this value-overwriting behaviour does not have any impact on runtime behaviour.

Prior to Sphinx v8, both of them had type str, and so mypy did not detect a problem. With Sphinx v8 their types diverge as a result of sphinx-doc/sphinx#12575 - one of them remains str and the other becomes str | None.

By assigning each of them a distinct variable name, this changeset resolves mypy validation errors when the Sphinx v8.0.0 codebase is installed as a type-checking dependency (discovered during #13).

cc @AA-Turner

[AA-Turner]

Thanks!

A

[jayaddison]

Thank you!