merge heads

birkenfeld · birkenfeld · commit 09d71269e2b6 · 2012-03-25T20:38:15.000+02:00
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
@@ -2120,8 +2120,6 @@ def __init__(self, spec, spec_set=False, parent=None,
     type(create_autospec),
     # instance method
     type(ANY.__eq__),
-    # unbound method
-    type(_ANY.__eq__),
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -2120,8 +2120,6 @@ def __init__(self, spec, spec_set=False, parent=None,`
`2120`	`2120`	`type(create_autospec),`
`2121`	`2121`	`# instance method`
`2122`	`2122`	`type(ANY.__eq__),`
`2123`		`- # unbound method`
`2124`		`- type(_ANY.__eq__),`
`2125`	`2123`	`)`
`2126`	`2124`
`2127`	`2125`