Merged in b-enlnt/pdb/b64 (pull request #48)

Fix setup on Python 3.x. Add py3.6 environment into tox.
pdbpp · Jun 11, 2017 · 1a1b6c2 · 1a1b6c2
2 parents 1376bbb + 1f02f7a
commit 1a1b6c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup, find_packages
 from setuptools.command.install import install
 from distutils.core import Command
+import io
 HACK = 'pdbmm_hijack_pdb.pth'
 
-readme = os.path.join(os.path.dirname(__file__), 'README.rst')
-changelog = os.path.join(os.path.dirname(__file__), 'CHANGELOG')
-long_description = open(readme).read() + '\n\n' + open(changelog).read()
+readme_path = os.path.join(os.path.dirname(__file__), 'README.rst')
+changelog_path = os.path.join(os.path.dirname(__file__), 'CHANGELOG')
+
+readme = io.open(readme_path, encoding='utf-8').read()
+changelog = io.open(changelog_path, encoding='utf-8').read()
+
+long_description = readme + '\n\n' + changelog
+
 
 class install_with_pth(install):
     sub_commands = install.sub_commands + [
@@ -18,7 +24,6 @@ class install_with_pth(install):
     ]
 
 
-
 class install_pth_hack(Command):
     user_options = [
         ('install-dir=', 'd', "directory to install to"),

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, pypy, py32, py33, py34, py35, pypy3
+envlist = py26, py27, pypy, py32, py33, py34, py35, py36, pypy3
 
 [testenv]
 deps =