[pypy-svn] pypy default: (fijal, arigo)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r40976:fd0235dccd97
Date: 2011-01-20 12:08 +0100
http://bitbucket.org/pypy/pypy/changeset/fd0235dccd97/

Log:	(fijal, arigo)

	Forgot to sort() the result of dir().

diff --git a/pypy/module/__builtin__/test/test_builtin.py b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -113,7 +113,7 @@
     def test_dir_custom(self):
         class Foo(object):
             def __dir__(self):
-                return [1, 2, 3]
+                return [1, 3, 2]
         f = Foo()
         assert dir(f) == [1, 2, 3]
         #

diff --git a/pypy/module/__builtin__/app_inspect.py b/pypy/module/__builtin__/app_inspect.py
--- a/pypy/module/__builtin__/app_inspect.py
+++ b/pypy/module/__builtin__/app_inspect.py
@@ -81,6 +81,7 @@
         if not isinstance(result, list):
             raise TypeError("__dir__() must return a list, not %r" % (
                 type(result),))
+        result.sort()
         return result
 
     else: #(regular item)