[Python-checkins] cpython: #16309: avoid using deprecated method and turn docstring in a comment.

Fri Nov 23 00:51:36 CET 2012

http://hg.python.org/cpython/rev/803e5a732331
changeset: 80562:803e5a732331
parent: 80560:fbca723b5485
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Nov 23 01:51:20 2012 +0200
summary:
 #16309: avoid using deprecated method and turn docstring in a comment.
files:
 Lib/test/test_cmd_line.py | 12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -218,11 +218,11 @@
 self.assertIn(path2.encode('ascii'), out)
 
 def test_empty_PYTHONPATH_issue16309(self):
- """On Posix, it is documented that setting PATH to the
- empty string is equivalent to not setting PATH at all,
- which is an exception to the rule that in a string like
- "/bin::/usr/bin" the empty string in the middle gets
- interpreted as '.'"""
+ # On Posix, it is documented that setting PATH to the
+ # empty string is equivalent to not setting PATH at all,
+ # which is an exception to the rule that in a string like
+ # "/bin::/usr/bin" the empty string in the middle gets
+ # interpreted as '.'
 code = """if 1:
 import sys
 path = ":".join(sys.path)
@@ -232,7 +232,7 @@
 rc2, out2, err2 = assert_python_ok('-c', code)
 # regarding to Posix specification, outputs should be equal
 # for empty and unset PYTHONPATH
- self.assertEquals(out1, out2)
+ self.assertEqual(out1, out2)
 
 def test_displayhook_unencodable(self):
 for encoding in ('ascii', 'latin-1', 'utf-8'):
-- 
Repository URL: http://hg.python.org/cpython
