diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-05-23 21:22:42 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-05-23 21:22:42 (GMT) |
| commit | f5fcd33be9b21b148774d3fa2832bb0627e94809 (patch) | |
| tree | 2c445e396ed3cd28b9d83d633f62c7708798364e /Lib | |
| parent | 4b244ef2554bd6e35fb432ad9b55eae90f37b4db (diff) | |
| parent | 7963a35b417dfde5d97c52c05b73af738c827ca6 (diff) | |
| download | cpython-f5fcd33be9b21b148774d3fa2832bb0627e94809.zip cpython-f5fcd33be9b21b148774d3fa2832bb0627e94809.tar.gz cpython-f5fcd33be9b21b148774d3fa2832bb0627e94809.tar.bz2 | |
merge 3.1
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_descr.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 6638116..e90e0b9 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -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): |