changeset:   96733:8c85291e86bf
parent:      96731:e858afe55ce9
parent:      96732:0b7c313851ca
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Tue Jun 30 21:19:00 2015 -0400
description:
Merge 3.5 (Issue #24400)


diff -r e858afe55ce9 -r 8c85291e86bf Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py	Tue Jun 30 18:25:55 2015 -0400
+++ b/Lib/test/test_inspect.py	Tue Jun 30 21:19:00 2015 -0400
@@ -95,7 +95,7 @@
         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
-        expected = 19
+        expected = 18
         err_msg = "There are %d (not %d) is* functions" % (count, expected)
         self.assertEqual(count, expected, err_msg)