merge 3.1

This commit is contained in:
Benjamin Peterson 2011-05-23 16:22:42 -05:00
commit f5fcd33be9
3 changed files with 10 additions and 5 deletions

View file

@ -1587,6 +1587,7 @@ order (MRO) for bases """
("__floor__", math.floor, zero, set(), {}),
("__trunc__", math.trunc, zero, set(), {}),
("__ceil__", math.ceil, zero, set(), {}),
("__dir__", dir, empty_seq, set(), {}),
]
class Checker(object):