Merge pull request #51122 from Ch3LL/bp-51086

Backport #51086 into 2019.2.0.rc1
This commit is contained in:
Thomas S Hatch 2019-01-09 09:27:50 -07:00 committed by GitHub
commit 9b96083191
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -855,7 +855,7 @@ class SaltDistribution(distutils.dist.Distribution):
self.name = 'salt-ssh' if PACKAGED_FOR_SALT_SSH else 'salt'
self.salt_version = __version__ # pylint: disable=undefined-variable
self.description = 'Portable, distributed, remote execution and configuration management system'
with open(SALT_LONG_DESCRIPTION_FILE) as f:
with open(SALT_LONG_DESCRIPTION_FILE, encoding='utf-8') as f:
self.long_description = f.read()
self.long_description_content_type = 'text/x-rst'
self.author = 'Thomas S Hatch'