summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-10-27 21:24:21 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-10-27 21:24:21 (GMT)
commit8c0e217158cac54fd32fb3b61e715f6a79e55209 (patch)
tree6b72387d5d7c26c9cb30229d0f31f1274492943f
parent481b85ae248ab0eed3e8480b19c47b841485330e (diff)
downloadcpython-8c0e217158cac54fd32fb3b61e715f6a79e55209.zip
cpython-8c0e217158cac54fd32fb3b61e715f6a79e55209.tar.gz
cpython-8c0e217158cac54fd32fb3b61e715f6a79e55209.tar.bz2
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 ........
-rw-r--r--Lib/test/test_site.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 6935798..ffdeab6 100644
--- 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 9707276..edbe964 100644
--- 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.