Remove isCallable() and sequenceIncludes() from the operator module.

diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 1d9a60b61c8c070d330e303b260b64dbc968e4fb..1e19cf54bef3aba709cdcd69037d7c36bd76356d 100644 (file)
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -257,8 +257,6 @@ class BoolTest(unittest.TestCase):
         import operator
         self.assertIs(operator.truth(0), False)
         self.assertIs(operator.truth(1), True)
-        self.assertIs(operator.isCallable(0), False)
-        self.assertIs(operator.isCallable(len), True)
         self.assertIs(operator.isNumberType(None), False)
         self.assertIs(operator.isNumberType(0), True)
         self.assertIs(operator.not_(1), False)

diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
index e05d05444e2b7611dfccf08cfee280eff0669bfd..f9519b236572c1e6ebf08fcb326362e5feefede4 100644 (file)
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -177,17 +177,6 @@ class OperatorTestCase(unittest.TestCase):
         self.failUnlessRaises(TypeError, operator.invert, None)
         self.failUnless(operator.inv(4) == -5)
 
-    def test_isCallable(self):
-        self.failUnlessRaises(TypeError, operator.isCallable)
-        class C:
-            pass
-        def check(self, o, v):
-            self.assert_(operator.isCallable(o) == callable(o) == v)
-        check(self, 4, 0)
-        check(self, operator.isCallable, 1)
-        check(self, C, 1)
-        check(self, C(), 0)
-
     def test_isMappingType(self):
         self.failUnlessRaises(TypeError, operator.isMappingType)
         self.failIf(operator.isMappingType(1))
@@ -296,8 +285,6 @@ class OperatorTestCase(unittest.TestCase):
         self.failUnlessRaises(TypeError, operator.contains, None, None)
         self.failUnless(operator.contains(range(4), 2))
         self.failIf(operator.contains(range(4), 5))
-        self.failUnless(operator.sequenceIncludes(range(4), 2))
-        self.failIf(operator.sequenceIncludes(range(4), 5))
 
     def test_setitem(self):
         a = range(3)

diff --git a/Misc/NEWS b/Misc/NEWS
index 002a26c80c2e29f1a7e91123471f2c518daef58c..c2699ec53aeeb61f0919ddc20e5442ec24b8f26a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -156,6 +156,10 @@ Core and Builtins
 Extension Modules
 -----------------
 
+- isCallable() and sequenceIncludes() have been removed from the operator
+  module.
+
+
 Library
 -------
 

diff --git a/Modules/operator.c b/Modules/operator.c
index fa40da496edb98a08e3e94aeb1884694006b2cc9..90fac79619c82c5673d762ca1789f43f530b7701 100644 (file)
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -65,7 +65,6 @@ used for special class methods; variants without leading and trailing\n\
   if(! PyArg_UnpackTuple(a,#OP,2,2,&a1,&a2)) return NULL; \
   return PyObject_RichCompare(a1,a2,A); }
 
-spami(isCallable       , PyCallable_Check)
 spami(isNumberType     , PyNumber_Check)
 spami(truth            , PyObject_IsTrue)
 spam2(op_add           , PyNumber_Add)
@@ -102,7 +101,6 @@ spamoi(op_repeat       , PySequence_Repeat)
 spam2(op_iconcat       , PySequence_InPlaceConcat)
 spamoi(op_irepeat      , PySequence_InPlaceRepeat)
 spami2b(op_contains     , PySequence_Contains)
-spami2b(sequenceIncludes, PySequence_Contains)
 spamn2(indexOf         , PySequence_Index)
 spamn2(countOf         , PySequence_Count)
 spami(isMappingType    , PyMapping_Check)
@@ -218,8 +216,6 @@ op_delslice(PyObject *s, PyObject *a)
 
 static struct PyMethodDef operator_methods[] = {
 
-spam1o(isCallable,
- "isCallable(a) -- Same as callable(a).")
 spam1o(isNumberType,
  "isNumberType(a) -- Return True if a has a numeric type, False otherwise.")
 spam1o(isSequenceType,
@@ -228,8 +224,6 @@ spam1o(truth,
  "truth(a) -- Return True if a is true, False otherwise.")
 spam2(contains,__contains__,
  "contains(a, b) -- Same as b in a (note reversed operands).")
-spam1(sequenceIncludes,
- "sequenceIncludes(a, b) -- Same as b in a (note reversed operands; deprecated).")
 spam1(indexOf,
  "indexOf(a, b) -- Return the first index of b in a.")
 spam1(countOf,