diff options
| -rw-r--r-- | Lib/distutils/command/install_egg_info.py | 5 | ||||
| -rw-r--r-- | Lib/distutils/dist.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/distutils/command/install_egg_info.py b/Lib/distutils/command/install_egg_info.py index c888031..c2a7d64 100644 --- a/Lib/distutils/command/install_egg_info.py +++ b/Lib/distutils/command/install_egg_info.py @@ -40,9 +40,8 @@ class install_egg_info(Command): "Creating "+self.install_dir) log.info("Writing %s", target) if not self.dry_run: - f = open(target, 'w') - self.distribution.metadata.write_pkg_file(f) - f.close() + with open(target, 'w', encoding='UTF-8') as f: + self.distribution.metadata.write_pkg_file(f) def get_outputs(self): return self.outputs diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index 02cd79b..8ca5b6f 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -1010,11 +1010,9 @@ class DistributionMetadata: def write_pkg_info(self, base_dir): """Write the PKG-INFO file into the release tree. """ - pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w') - try: + with open(os.path.join(base_dir, 'PKG-INFO'), 'w', + encoding='UTF-8') as pkg_info: self.write_pkg_file(pkg_info) - finally: - pkg_info.close() def write_pkg_file(self, file): """Write the PKG-INFO format data to a file object. @@ -271,6 +271,9 @@ Core and Builtins Library ------- +- Issue #9561: distutils now reads and writes egg-info files using UTF-8, + instead of the locale encoding. + - Issue #8286: The distutils command sdist will print a warning message instead of crashing when an invalid path is given in the manifest template. |