Doc: update Sphinx toolchain also in make.bat
merge heads
merge with 3.3
Issue19995: issue deprecation warning for non-integer values to %c, %o, %x, %X
Fixed incorrect merge in 1638360eea41.
Issue #20138: The wsgiref.application_uri() and wsgiref.request_uri()
functions now conform to PEP 3333 when handle non-ASCII URLs.
Issue #20138: The wsgiref.application_uri() and wsgiref.request_uri()
functions now conform to PEP 3333 when handle non-ASCII URLs.