summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descr.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-23 21:27:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-23 21:27:36 (GMT)
commit5cc10b00094f06af56dedd02d39bc46886e17c70 (patch)
treea6bb19f9a5eab8dfa7d1145d92b87c3b9faba61d /Lib/test/test_descr.py
parent1dc540702072c381c3e7570f075a3f1147353d92 (diff)
parentf5fcd33be9b21b148774d3fa2832bb0627e94809 (diff)
downloadcpython-5cc10b00094f06af56dedd02d39bc46886e17c70.zip
cpython-5cc10b00094f06af56dedd02d39bc46886e17c70.tar.gz
cpython-5cc10b00094f06af56dedd02d39bc46886e17c70.tar.bz2
merge 3.2
Diffstat (limited to 'Lib/test/test_descr.py')
-rw-r--r--Lib/test/test_descr.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 9273c46..31731d2 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):