Collapse encoding detection

1c00a900 · Jason R. Coombs · b8936cee · 1c00a900
Commit 1c00a900 authored Oct 11, 2017 by Jason R. Coombs
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

setuptools/tests/test_sdist.py setuptools/tests/test_sdist.py +3 -4

No files found.
--- 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':
+                if fs_enc != 'mbcs':
-                    filename = filename.decode('mbcs')
+                    fs_enc = 'latin-1'
-                else:
+                filename = filename.decode(fs_enc)
-                    filename = filename.decode('latin-1')
                assert filename in cmd.filelist.files
            else: