Commit 4d239698 authored by Jason R. Coombs's avatar Jason R. Coombs

Use unicode from compat module

--HG--
branch : distribute
extra : rebase_source : c4dd03dba58146eed2f620cd6d6b7ab52ee9d109
extra : histedit_source : 02c194ea1c97e8aea64fd23d77efc1bade185c0a
parent f52d063a
...@@ -9,7 +9,7 @@ import tempfile ...@@ -9,7 +9,7 @@ import tempfile
import unittest import unittest
import unicodedata import unicodedata
from setuptools.compat import StringIO from setuptools.compat import StringIO, unicode
from setuptools.command.sdist import sdist from setuptools.command.sdist import sdist
from setuptools.command.egg_info import manifest_maker from setuptools.command.egg_info import manifest_maker
from setuptools.dist import Distribution from setuptools.dist import Distribution
...@@ -55,7 +55,7 @@ def b(s, encoding='utf-8'): ...@@ -55,7 +55,7 @@ def b(s, encoding='utf-8'):
# Convert to POSIX path # Convert to POSIX path
def posix(path): def posix(path):
if sys.version_info >= (3,) and not isinstance(path, unicode): if sys.version_info >= (3,) and not isinstance(path, str):
return path.replace(os.sep.encode('ascii'), b('/')) return path.replace(os.sep.encode('ascii'), b('/'))
else: else:
return path.replace(os.sep, '/') return path.replace(os.sep, '/')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment