Index: Lib/test/test_operator.py =================================================================== --- Lib/test/test_operator.py (revision 47214) +++ Lib/test/test_operator.py (working copy) @@ -182,17 +182,6 @@ 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)) @@ -299,8 +288,6 @@ 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) Index: Lib/test/test_bool.py =================================================================== --- Lib/test/test_bool.py (revision 47214) +++ Lib/test/test_bool.py (working copy) @@ -257,8 +257,6 @@ 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) Index: Modules/operator.c =================================================================== --- Modules/operator.c (revision 47214) +++ Modules/operator.c (working copy) @@ -65,7 +65,6 @@ 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) @@ -104,7 +103,6 @@ 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) @@ -228,8 +226,6 @@ 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, @@ -238,8 +234,6 @@ "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, Index: Doc/lib/liboperator.tex =================================================================== --- Doc/lib/liboperator.tex (revision 47214) +++ Doc/lib/liboperator.tex (working copy) @@ -225,11 +225,6 @@ \var{b} is an integer. \end{funcdesc} -\begin{funcdesc}{sequenceIncludes}{\unspecified} -\deprecated{2.0}{Use \function{contains()} instead.} -Alias for \function{contains()}. -\end{funcdesc} - \begin{funcdesc}{setitem}{a, b, c} \funcline{__setitem__}{a, b, c} Set the value of \var{a} at index \var{b} to \var{c}. @@ -359,14 +354,6 @@ True \end{verbatim} -\begin{funcdesc}{isCallable}{o} -\deprecated{2.0}{Use the \function{callable()} built-in function instead.} -Returns true if the object \var{o} can be called like a function, -otherwise it returns false. True is returned for functions, bound and -unbound methods, class objects, and instance objects which support the -\method{__call__()} method. -\end{funcdesc} - \begin{funcdesc}{isMappingType}{o} Returns true if the object \var{o} supports the mapping interface. This is true for dictionaries and all instance objects defining