[Python-checkins] cpython (merge 3.2 -> default): Merge fix from 3.2

Wed Feb 15 18:13:13 CET 2012

http://hg.python.org/cpython/rev/b136e22daa37
changeset: 74954:b136e22daa37
parent: 74952:4ba43318e56b
parent: 74953:77ac369fbbf1
user: Éric Araujo <merwok at netwok.org>
date: Wed Feb 15 18:13:00 2012 +0100
summary:
 Merge fix from 3.2
files:
 Lib/distutils/tests/test_build_ext.py | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -187,7 +187,8 @@
 cmd = build_ext(dist)
 cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep
 cmd.finalize_options()
- self.assertEqual(cmd.library_dirs, ['my_lib_dir', 'other_lib_dir'])
+ self.assertIn('my_lib_dir', cmd.library_dirs)
+ self.assertIn('other_lib_dir', cmd.library_dirs)
 
 # make sure rpath is turned into a list
 # if it's a string
-- 
Repository URL: http://hg.python.org/cpython
