summaryrefslogtreecommitdiff
path: root/setuptools/unicode_utils.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-01-23 19:08:57 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-01-23 19:08:57 -0500
commit7135e646807d607edd684db8555407dfb6ea7382 (patch)
treec4c10f2ccb94cf3bbbfbbf619a61fd9c401981b9 /setuptools/unicode_utils.py
parent0d02d0716a4ef1ebc139fd12294a641dd95b85f8 (diff)
downloadpython-setuptools-bitbucket-master.tar.gz
Avoid TypeError when getfilesystemencoding returns None. Fixes #486.HEADmaster
Diffstat (limited to 'setuptools/unicode_utils.py')
-rw-r--r--setuptools/unicode_utils.py2
1 files changed, 1 insertions, 1 deletions
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: