Merge with 3.3 for Issue #19544 and Issue #6286. Merge is untested. I was unable to test due to bab0cbf86835.

Issue #19544 and Issue #6286: Restore use of urllib over http allowing use of http_proxy for Distutils upload command, a feature accidentally lost in the rollback of distutils2.

Issue 19544 and Issue #7457: Restore the read_pkg_file method to distutils.dist.DistributionMetadata accidentally removed in the undo of distutils2.

Issue #19286: Adding test demonstrating the failure when a directory is found in the package_data globs.

Patch by Oscar Benjamin.

Patch by Oscar Benjamin.

The only file change is adding the v3.2.5 tag to the .hgtags file.

The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.

ModuleNotFoundError.

is overriden with the CC environment variable, use the new compiler as
the default for linking if LDSHARED is not also overriden.  This restores
Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.

distutils.cfg when a venv is active.