Handle encoding when opening file for both py2/py3

Conflicts: setup.py
saltstack · Jan 17, 2019 · 82acce4 · 82acce4
1 parent 094bd33
commit 82acce4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 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
 project and develops and sells SaltStack Enterprise software, services
 and support. Easy enough to get running in minutes, scalable enough to

diff --git a/setup.py b/setup.py
@@ -874,7 +874,10 @@ def __init__(self, attrs=None):
         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:
+        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_content_type = 'text/x-rst'
         self.author = 'Thomas S Hatch'