Merged revisions 74287 via svnmerge from

svn+ssh://pythondev@www.python.org/python/branches/py3k

................
  r74287 | mark.dickinson | 2009-08-02 16:51:19 +0100 (Sun, 02 Aug 2009) | 10 lines

  Merged revisions 74285 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74285 | mark.dickinson | 2009-08-02 16:40:11 +0100 (Sun, 02 Aug 2009) | 3 lines

    Issue #6619:  Remove duplicate 'isgenerator' function from inspect module.
    Thanks Vincent Legoll.
  ........
................

diff --git a/Lib/inspect.py b/Lib/inspect.py
index fe3ffc7de5d62a8f1cd3f1c68d41e849677c2c5a..4b3e27a4ca2b5447856fcb058b2ddb16352e5ead 100644 (file)
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -236,10 +236,6 @@ def isroutine(object):
             or ismethod(object)
             or ismethoddescriptor(object))
 
-def isgenerator(object):
-    """Return true if the object is a generator object."""
-    return isinstance(object, types.GeneratorType)
-
 def isabstract(object):
     """Return true if the object is an abstract base class (ABC)."""
     return isinstance(object, type) and object.__flags__ & TPFLAGS_IS_ABSTRACT

diff --git a/Misc/ACKS b/Misc/ACKS
index 43dcb869c062b9b951e93ccdc4ce98282c828174..644c8035fe522cc462e0f93e7513f7393b369edf 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -425,6 +425,7 @@ Thomas Lee
 Christopher Lee
 Tennessee Leeuwenburg
 Luc Lefebvre
+Vincent Legoll
 Kip Lehman
 Joerg Lehmann
 Luke Kenneth Casson Leighton