Commit e9685aa4 authored by Philip Thiem's avatar Philip Thiem

don't decode in python 2.x. that's my oops

--HG--
branch : distribute
extra : rebase_source : 4b981d54c6a171d7a6500c6c62838d8c368ae0b1
parent 968ff840
...@@ -372,13 +372,11 @@ class TestSdistTest(unittest.TestCase): ...@@ -372,13 +372,11 @@ class TestSdistTest(unittest.TestCase):
unquiet() unquiet()
if sys.version_info >= (3,): if sys.version_info >= (3,):
fs_enc = sys.getfilesystemencoding()
#not all windows systems have a default FS encoding of cp1252 #not all windows systems have a default FS encoding of cp1252
if sys.platform == 'win32': if sys.platform == 'win32':
# Latin-1 is similar to Windows-1252 however # Latin-1 is similar to Windows-1252 however
# on mbcs filesys it is not in latin-1 encoding # 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') filename = filename.decode('mbcs')
else: else:
...@@ -392,7 +390,6 @@ class TestSdistTest(unittest.TestCase): ...@@ -392,7 +390,6 @@ class TestSdistTest(unittest.TestCase):
else: else:
# No conversion takes place under Python 2 and the file # No conversion takes place under Python 2 and the file
# is included. We shall keep it that way for BBB. # is included. We shall keep it that way for BBB.
filename = filename.decode('latin-1')
self.assertTrue(filename in cmd.filelist.files) self.assertTrue(filename in cmd.filelist.files)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment