summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorCollin Winter <collinw@gmail.com>2007-03-21 20:10:51 (GMT)
committerCollin Winter <collinw@gmail.com>2007-03-21 20:10:51 (GMT)
commit390d29ca743d262cf667a794af71f141a7a161f6 (patch)
tree58597de1d1afc12d23b88be69535d958ec73d90e /Lib/test
parent7d71fb8132d1ce0c49ad4557b89da592120cf118 (diff)
downloadcpython-390d29ca743d262cf667a794af71f141a7a161f6.zip
cpython-390d29ca743d262cf667a794af71f141a7a161f6.tar.gz
cpython-390d29ca743d262cf667a794af71f141a7a161f6.tar.bz2
Remove isCallable() and sequenceIncludes() from the operator module.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_bool.py2
-rw-r--r--Lib/test/test_operator.py13
2 files changed, 0 insertions, 15 deletions
diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 1d9a60b..1e19cf5 100644
--- 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 e05d054..f9519b2 100644
--- 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)