diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-10-11 15:03:47 +0200 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-10-11 15:03:47 +0200 |
| commit | 1c00a900c9aba25d6369cf9312997434ad68b9b1 (patch) | |
| tree | fb842a1e21ab8e2df353ecd14268643f0653562d | |
| parent | b8936cee54cc023ba6c6081e03e0425bce20b1f7 (diff) | |
| download | external_python_setuptools-1c00a900c9aba25d6369cf9312997434ad68b9b1.tar.gz external_python_setuptools-1c00a900c9aba25d6369cf9312997434ad68b9b1.tar.bz2 external_python_setuptools-1c00a900c9aba25d6369cf9312997434ad68b9b1.zip | |
Collapse encoding detection
| -rw-r--r-- | setuptools/tests/test_sdist.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py index 1b5422f4..5cb63c4b 100644 --- a/setuptools/tests/test_sdist.py +++ b/setuptools/tests/test_sdist.py @@ -374,10 +374,9 @@ class TestSdistTest: # Latin-1 is similar to Windows-1252 however # on mbcs filesys it is not in latin-1 encoding fs_enc = sys.getfilesystemencoding() - if fs_enc == 'mbcs': - filename = filename.decode('mbcs') - else: - filename = filename.decode('latin-1') + if fs_enc != 'mbcs': + fs_enc = 'latin-1' + filename = filename.decode(fs_enc) assert filename in cmd.filelist.files else: |