[Python-checkins] cpython (merge 3.2 -> default): Issue #13861: merge

Fri Feb 3 23:16:48 CET 2012

http://hg.python.org/cpython/rev/ff230e366610
changeset: 74747:ff230e366610
parent: 74743:bf24b2e1be24
parent: 74746:5eb47e1732a0
user: Ned Deily <nad at acm.org>
date: Fri Feb 03 23:16:11 2012 +0100
summary:
 Issue #13861: merge
files:
 Lib/test/test_pydoc.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -405,7 +405,7 @@
 badsyntax = os.path.join(pkgdir, "__init__") + os.extsep + "py"
 with open(badsyntax, 'w') as f:
 f.write("invalid python syntax = 1ドル\n")
- result = run_pydoc('nothing', '-k', PYTHONPATH=TESTFN)
+ result = run_pydoc('zqwykjv', '-k', PYTHONPATH=TESTFN)
 self.assertEqual(b'', result)
 
 def test_apropos_with_unreadable_dir(self):
@@ -415,7 +415,7 @@
 self.addCleanup(os.rmdir, self.unreadable_dir)
 # Note, on Windows the directory appears to be still
 # readable so this is not really testing the issue there
- result = run_pydoc('nothing', '-k', PYTHONPATH=TESTFN)
+ result = run_pydoc('zqwykjv', '-k', PYTHONPATH=TESTFN)
 self.assertEqual(b'', result)
 
 
-- 
Repository URL: http://hg.python.org/cpython
