diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-23 17:26:24 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-23 17:26:34 -0400 |
| commit | 8cca69b8ffd372ce5e3089cebbdbf92c071f3761 (patch) | |
| tree | 6300de4fda7c64f81ecc98e54c1ca3e3ea9bd5d5 /setuptools/unicode_utils.py | |
| parent | f852d1598a7814f5f4f6e8bf26d3d60cffe1798a (diff) | |
| parent | 662816b65fbbfaf4e8ff523e39a6034785a4d8eb (diff) | |
| download | python-setuptools-git-feature/2093-docs-revamp.tar.gz | |
Merge branch 'master' into feature/2093-docs-revampfeature/2093-docs-revamp
Diffstat (limited to 'setuptools/unicode_utils.py')
| -rw-r--r-- | setuptools/unicode_utils.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py index 7c63efd2..e84e65e3 100644 --- a/setuptools/unicode_utils.py +++ b/setuptools/unicode_utils.py @@ -1,12 +1,10 @@ import unicodedata import sys -from setuptools.extern import six - # HFS Plus uses decomposed UTF-8 def decompose(path): - if isinstance(path, six.text_type): + if isinstance(path, str): return unicodedata.normalize('NFD', path) try: path = path.decode('utf-8') @@ -23,7 +21,7 @@ def filesys_decode(path): NONE when no expected encoding works """ - if isinstance(path, six.text_type): + if isinstance(path, str): return path fs_enc = sys.getfilesystemencoding() or 'utf-8' |