aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Thiem <ptthiem@gmail.com>2013-02-16 15:22:46 -0600
committerPhilip Thiem <ptthiem@gmail.com>2013-02-16 15:22:46 -0600
commite9685aa408ac3d118890bd9944bd26260e519908 (patch)
treeb2a25c4c63c8f26b9e3c90468cc495bdb30221ee
parent968ff8401b82ad8454191f564c903b137a8e8714 (diff)
downloadexternal_python_setuptools-e9685aa408ac3d118890bd9944bd26260e519908.tar.gz
external_python_setuptools-e9685aa408ac3d118890bd9944bd26260e519908.tar.bz2
external_python_setuptools-e9685aa408ac3d118890bd9944bd26260e519908.zip
don't decode in python 2.x. that's my oops
--HG-- branch : distribute extra : rebase_source : 4b981d54c6a171d7a6500c6c62838d8c368ae0b1
-rw-r--r--setuptools/tests/test_sdist.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 7e6c837c..f51d4567 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -372,13 +372,11 @@ class TestSdistTest(unittest.TestCase):
unquiet()
if sys.version_info >= (3,):
- fs_enc = sys.getfilesystemencoding()
-
-
#not all windows systems have a default FS encoding of cp1252
if sys.platform == 'win32':
# 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:
@@ -392,7 +390,6 @@ class TestSdistTest(unittest.TestCase):
else:
# No conversion takes place under Python 2 and the file
# is included. We shall keep it that way for BBB.
- filename = filename.decode('latin-1')
self.assertTrue(filename in cmd.filelist.files)