diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 15:06:51 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 15:06:51 -0400 |
| commit | b49435397a5094f94678adf3549cc8941aa469b7 (patch) | |
| tree | b123bdd63482393ba1e2859364920f40a3d9f71d /setuptools/unicode_utils.py | |
| parent | 5b865b1b6e23379d23aa80e74adb38db8b14b6ca (diff) | |
| download | external_python_setuptools-b49435397a5094f94678adf3549cc8941aa469b7.tar.gz external_python_setuptools-b49435397a5094f94678adf3549cc8941aa469b7.tar.bz2 external_python_setuptools-b49435397a5094f94678adf3549cc8941aa469b7.zip | |
Use six for Python 2 compatibility
--HG--
branch : feature/issue-229
extra : source : 7b1997ececc5772798ce33a0f8e77387cb55a977
Diffstat (limited to 'setuptools/unicode_utils.py')
| -rw-r--r-- | setuptools/unicode_utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py index d2de941a..f028589e 100644 --- a/setuptools/unicode_utils.py +++ b/setuptools/unicode_utils.py @@ -1,11 +1,11 @@ import unicodedata import sys -from setuptools.compat import unicode as decoded_string +import six # HFS Plus uses decomposed UTF-8 def decompose(path): - if isinstance(path, decoded_string): + if isinstance(path, six.text_type): return unicodedata.normalize('NFD', path) try: path = path.decode('utf-8') @@ -23,7 +23,7 @@ def filesys_decode(path): """ fs_enc = sys.getfilesystemencoding() - if isinstance(path, decoded_string): + if isinstance(path, six.text_type): return path for enc in (fs_enc, "utf-8"): |