diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-23 19:08:57 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-23 19:08:57 -0500 |
| commit | 3223234b137e9766a6f4e892a3369b13f57f878b (patch) | |
| tree | 944090fa0eaf7b5021d3edaa7327fe9a3a97e279 | |
| parent | 3d018c03405ecb21dfb717311f176c6586df343a (diff) | |
| download | python-setuptools-git-3223234b137e9766a6f4e892a3369b13f57f878b.tar.gz | |
Avoid TypeError when getfilesystemencoding returns None. Fixes #486.
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | setuptools/unicode_utils.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c7f68ab4..11298b57 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,12 @@ CHANGES ======= +19.4.2 +------ + +* Issue #486: Correct TypeError when getfilesystemencoding + returns None. + 19.4.1 ------ diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py index 6eee6351..ffab3e24 100644 --- a/setuptools/unicode_utils.py +++ b/setuptools/unicode_utils.py @@ -25,7 +25,7 @@ def filesys_decode(path): if isinstance(path, six.text_type): return path - fs_enc = sys.getfilesystemencoding() + fs_enc = sys.getfilesystemencoding() or 'utf-8' candidates = fs_enc, 'utf-8' for enc in candidates: |