saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Handle encoding when opening file for both py2/py3

Browse source 
Conflicts:
	setup.py
This commit is contained in:
Ch3LL 2019-01-09 12:21:36 -05:00 • committed by Gareth J. Greenaway
parent 094bd33279
commit 82acce47cd
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -2,7 +2,7 @@
What is SaltStack? What is SaltStack?
================== ==================
SaltStack makes software for complex systems management at scale. SaltStack makes software for complex systems management at scale.
SaltStack is the company that created and maintains the Salt Open SaltStack is the company that created and maintains the Salt Open
project and develops and sells SaltStack Enterprise software, services project and develops and sells SaltStack Enterprise software, services
and support. Easy enough to get running in minutes, scalable enough to and support. Easy enough to get running in minutes, scalable enough to

5
setup.py
View file

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