[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[yury.selivanov]

https://hg.python.org/cpython/rev/df310e5ac015
changeset:   96735:df310e5ac015
parent:      96733:8c85291e86bf
parent:      96734:a5c6eaa7d733
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Tue Jun 30 21:45:03 2015 -0400
summary:
  Merge 3.5

files:
  Lib/test/test_inspect.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -94,7 +94,7 @@
     def test_eightteen(self):
         count = len([x for x in dir(inspect) if x.startswith('is')])
         # This test is here for remember you to update Doc/library/inspect.rst
-        # which claims there are 16 such functions
+        # which claims there are 18 such functions
         expected = 18
         err_msg = "There are %d (not %d) is* functions" % (count, expected)
         self.assertEqual(count, expected, err_msg)

-- 
Repository URL: https://hg.python.org/cpython