diff options
| author | Paul Ganssle <paul@ganssle.io> | 2018-03-18 11:43:00 -0400 |
|---|---|---|
| committer | Paul Ganssle <paul@ganssle.io> | 2018-03-18 11:43:00 -0400 |
| commit | a0723a66bf7950ee470971ac9931d751a7dd76f3 (patch) | |
| tree | 5efe17e9d162c56f47dd24febff88f67880e157d | |
| parent | 76f1da96edb2a9252c4aa7f4eacdac4312209d1c (diff) | |
| download | python-setuptools-git-a0723a66bf7950ee470971ac9931d751a7dd76f3.tar.gz | |
Stop patching write_pkg_info
| -rw-r--r-- | setuptools/dist.py | 9 | ||||
| -rw-r--r-- | setuptools/monkey.py | 16 |
2 files changed, 0 insertions, 25 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index 284d922d..321ab6b7 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -123,15 +123,6 @@ def write_pkg_file(self, file): file.write('Provides-Extra: %s\n' % extra) -# from Python 3.4 -def write_pkg_info(self, base_dir): - """Write the PKG-INFO file into the release tree. - """ - with open(os.path.join(base_dir, 'PKG-INFO'), 'w', - encoding='UTF-8') as pkg_info: - self.write_pkg_file(pkg_info) - - sequence = tuple, list diff --git a/setuptools/monkey.py b/setuptools/monkey.py index d9eb7d7b..08ed50d9 100644 --- a/setuptools/monkey.py +++ b/setuptools/monkey.py @@ -87,7 +87,6 @@ def patch_all(): distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse _patch_distribution_metadata_write_pkg_file() - _patch_distribution_metadata_write_pkg_info() # Install Distribution throughout the distutils for module in distutils.dist, distutils.core, distutils.cmd: @@ -111,21 +110,6 @@ def _patch_distribution_metadata_write_pkg_file(): ) -def _patch_distribution_metadata_write_pkg_info(): - """ - Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local - encoding to save the pkg_info. Monkey-patch its write_pkg_info method to - correct this undesirable behavior. - """ - environment_local = (3,) <= sys.version_info[:3] < (3, 2, 2) - if not environment_local: - return - - distutils.dist.DistributionMetadata.write_pkg_info = ( - setuptools.dist.write_pkg_info - ) - - def patch_func(replacement, target_mod, func_name): """ Patch func_name in target_mod with replacement |