summaryrefslogtreecommitdiff
path: root/Lib/test/test_builtin.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-11 16:12:08 -0500
committerBenjamin Peterson <benjamin@python.org>2011-06-11 16:12:08 -0500
commita361d317852063406994afefa36137646582880c (patch)
treed39b4f389f65d1bcab45e62844db4d48b3b2a038 /Lib/test/test_builtin.py
parentc16b21e6e75cbcfed4db3f83d17ccffab33ac6d7 (diff)
downloadcpython-a361d317852063406994afefa36137646582880c.tar.gz
allow __dir__ to return any sequence
Diffstat (limited to 'Lib/test/test_builtin.py')
-rw-r--r--Lib/test/test_builtin.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 97619cf9ef..ce1586f98d 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -372,7 +372,15 @@ class BuiltinTest(unittest.TestCase):
f = Foo()
self.assertTrue(dir(f) == ["ga", "kan", "roo"])
- # dir(obj__dir__not_list)
+ # dir(obj__dir__tuple)
+ class Foo(object):
+ def __dir__(self):
+ return ("b", "c", "a")
+ res = dir(Foo())
+ self.assertIsInstance(res, list)
+ self.assertTrue(res == ["a", "b", "c"])
+
+ # dir(obj__dir__not_sequence)
class Foo(object):
def __dir__(self):
return 7