summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-03-25 18:38:15 (GMT)
committerGeorg Brandl <georg@python.org>2012-03-25 18:38:15 (GMT)
commit09d71269e2b60a87bdd7d24f79f0ebcd78cadaa3 (patch)
treed75ee046b69664357c3ff92f5be0b8cb98d38e30
parent288b9bf1ea3ed68b3238fb2f2d579370ffdb634b (diff)
parentfb5d0a78cfa39472aab8c9d81ec299a6eb351869 (diff)
downloadcpython-09d71269e2b60a87bdd7d24f79f0ebcd78cadaa3.zip
cpython-09d71269e2b60a87bdd7d24f79f0ebcd78cadaa3.tar.gz
cpython-09d71269e2b60a87bdd7d24f79f0ebcd78cadaa3.tar.bz2
merge heads
-rw-r--r--Lib/unittest/mock.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 3cef550..d73bd53 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -2120,8 +2120,6 @@ FunctionTypes = (
type(create_autospec),
# instance method
type(ANY.__eq__),
- # unbound method
- type(_ANY.__eq__),
)