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

[yury.selivanov]

https://hg.python.org/cpython/rev/1b87b31434d8
changeset:   96737:1b87b31434d8
parent:      96735:df310e5ac015
parent:      96736:bd45435fd081
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Tue Jun 30 22:06:55 2015 -0400
summary:
  Merge 3.5

files:
  Doc/library/inspect.rst  |  2 +-
  Lib/test/test_inspect.py |  8 --------
  2 files changed, 1 insertions(+), 9 deletions(-)


diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -28,7 +28,7 @@
 -----------------
 
 The :func:`getmembers` function retrieves the members of an object such as a
-class or module. The sixteen functions whose names begin with "is" are mainly
+class or module. The functions whose names begin with "is" are mainly
 provided as convenient choices for the second argument to :func:`getmembers`.
 They also help you determine when you can expect to find the following special
 attributes:
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
@@ -91,14 +91,6 @@
 
 
 class TestPredicates(IsTestBase):
-    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 18 such functions
-        expected = 18
-        err_msg = "There are %d (not %d) is* functions" % (count, expected)
-        self.assertEqual(count, expected, err_msg)
-
 
     def test_excluding_predicates(self):
         global tb

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