aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsetup.py6
-rw-r--r--setuptools/tests/test_svn.py7
2 files changed, 6 insertions, 7 deletions
diff --git a/setup.py b/setup.py
index de254361..dc4391c2 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
#!/usr/bin/env python
"""Distutils setup file, used to install or test 'setuptools'"""
-import sys
+import io
import os
+import sys
import textwrap
-import codecs
# Allow to run setup.py from another directory.
os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -82,7 +82,7 @@ class test(_test):
f.write(ep_content)
-readme_file = codecs.open('README.txt', encoding='utf-8')
+readme_file = io.open('README.txt', encoding='utf-8')
# the release script adds hyperlinks to issues
if os.path.exists('CHANGES (links).txt'):
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index afee32b6..33400362 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
"""svn tests"""
-
+import io
import os
+import subprocess
import sys
import unittest
-import codecs
-import subprocess
from setuptools.tests import environment
from setuptools.compat import unicode, unichr
@@ -54,7 +53,7 @@ class TestSvnVersion(unittest.TestCase):
def _read_utf8_file(path):
fileobj = None
try:
- fileobj = codecs.open(path, 'r', 'utf-8')
+ fileobj = io.open(path, 'r', encoding='utf-8')
data = fileobj.read()
return data
finally: