Make generator repr consistent with function and code object repr.

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 7be0a90abf1bbfe4b0b1b614ef30dc7f1b470631..3702abc91afdec2cd6d8957d705bb85231536648 100644 (file)
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -927,7 +927,7 @@ Test the __name__ attribute and the repr()
 >>> g.__name__
 'f'
 >>> repr(g)  # doctest: +ELLIPSIS
-'<f generator object at ...>'
+'<generator object f at ...>'
 """
 
 # conjoin is a simple backtracking generator, named in honor of Icon's

diff --git a/Lib/test/test_genexps.py b/Lib/test/test_genexps.py
index ab9f85d7a4a9ca4d1038c6b6a6b43c7f50acf2d8..a86f12f03e60e793e8e79d79ac9254f00285a80c 100644 (file)
--- a/Lib/test/test_genexps.py
+++ b/Lib/test/test_genexps.py
@@ -92,7 +92,7 @@ Verify that parenthesis are required when used as a keyword argument value
 Verify that parenthesis are required when used as a keyword argument value
 
     >>> dict(a = (i for i in xrange(10))) #doctest: +ELLIPSIS
-    {'a': <<genexpr> generator object at ...>}
+    {'a': <generator object <genexpr> at ...>}
 
 Verify early binding for the outermost for-expression
 

diff --git a/Objects/genobject.c b/Objects/genobject.c
index 3cd911d5f849077da7bbbbabbbfcc318ec887c9f..d2ef508837cab85c56ed7e1c921ddacc6743dc98 100644 (file)
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -288,7 +288,7 @@ gen_repr(PyGenObject *gen)
        code_name = PyString_AsString(((PyCodeObject *)gen->gi_code)->co_name);
        if (code_name == NULL)
                return NULL;
-       return PyString_FromFormat("<%.200s generator object at %p>",
+       return PyString_FromFormat("<generator object %.200s at %p>",
                                   code_name, gen);
 }