Merged revisions 69693 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69693 | tarek.ziade | 2009-02-16 22:41:54 +0100 (Mon, 16 Feb 2009) | 1 line

  #2279: use os.sep so the MANIFEST file test work on win32
........

diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index de588112fd231a59a672b5f1e989e3af69c8bc86..b4e922f90c7bc45ebb203ff4b2b378ada8c699b8 100644 (file)
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -24,11 +24,11 @@ setup(name='fake')
 MANIFEST = """\
 README
 setup.py
-data/data.dt
-scripts/script.py
-somecode/__init__.py
-somecode/doc.dat
-somecode/doc.txt
+data%(sep)sdata.dt
+scripts%(sep)sscript.py
+somecode%(sep)s__init__.py
+somecode%(sep)sdoc.dat
+somecode%(sep)sdoc.txt
 """
 
 class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
@@ -198,7 +198,7 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST)
+        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
 def test_suite():
     return unittest.makeSuite(sdistTestCase)