Merged revisions 75871 via svnmerge from

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

........
  r75871 | tarek.ziade | 2009-10-27 22:20:27 +0100 (Tue, 27 Oct 2009) | 1 line

  Issue #7218: Fix test_site for win32
........

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 6935798a3fe49b93bcc424fcd7e3f6b3918db967..ffdeab6dd034315483321908575fae240fd3ace5 100644 (file)
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -168,7 +168,7 @@ class HelperFunctionsTests(unittest.TestCase):
         else:
             self.assertTrue(len(dirs), 2)
             self.assertEquals(dirs[0], 'xoxo')
-            wanted = os.path.join('xoxo', 'Lib', 'site-packages')
+            wanted = os.path.join('xoxo', 'lib', 'site-packages')
             self.assertEquals(dirs[1], wanted)
 
         # let's try the specific Apple location

diff --git a/Misc/NEWS b/Misc/NEWS
index 9707276ecb19deb9bde00ab297363deba1f7b163..edbe9645e137f1dcd0396b68229a8a3d7991cee3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -117,6 +117,9 @@ C-API
 Library
 -------
 
+- Issue #7218: Fix test_site for win32, the directory comparison was done with
+  an uppercase.
+
 - Issue #7205: Fix a possible deadlock when using a BZ2File object from
   several threads at once.