diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
| commit | fc4d9828768ceebd2f9337481450c88376c013e9 (patch) | |
| tree | 6dff622c50739ca19fdfbecf1008a42589d37b57 /setuptools/unicode_utils.py | |
| parent | 7bb73a477de24069002516eb6eb1d755bed9d65b (diff) | |
| parent | 03d36b9edb53e266a0b4b836e1e3178f989a0781 (diff) | |
| download | python-setuptools-git-feature/implicit-bootstrap.tar.gz | |
Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap
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' |