[pypy-svn] pypy default: Tests and fixes. Thanks victorg5.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r41727:43121832f78d
Date: 2011-02-09 13:56 +0100
http://bitbucket.org/pypy/pypy/changeset/43121832f78d/

Log:	Tests and fixes. Thanks victorg5.

diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -15,7 +15,7 @@
         self.running = False
 
     def descr__repr__(self, space):
-        code_name = self.frame.pycode.co_name
+        code_name = self.pycode.co_name
         addrstring = self.getaddrstring(space)
         return space.wrap("<generator object %s at 0x%s>" %
                           (code_name, addrstring))
@@ -137,7 +137,7 @@
         return self.pycode
 
     def descr__name__(space, self):
-        code_name = self.frame.pycode.co_name
+        code_name = self.pycode.co_name
         return space.wrap(code_name)
 
     def descr__del__(self):        

diff --git a/pypy/interpreter/test/test_generator.py b/pypy/interpreter/test/test_generator.py
--- a/pypy/interpreter/test/test_generator.py
+++ b/pypy/interpreter/test/test_generator.py
@@ -27,6 +27,7 @@
         assert not g.gi_running
         assert g.gi_frame is None
         assert g.gi_code is f.func_code
+        assert g.__name__ == 'f'
 
     def test_generator3(self):
         def f():
@@ -261,4 +262,8 @@
     def test_repr(self):
         def myFunc():
             yield 1
-        assert repr(myFunc()).startswith("<generator object myFunc at 0x")
+        g = myFunc()
+        r = repr(g)
+        assert r.startswith("<generator object myFunc at 0x")
+        assert list(g) == [1]
+        assert repr(g) == r