From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 2 Aug 2009 15:41:08 +0000 (+0000)
Subject: Merged revisions 74285 via svnmerge from
X-Git-Tag: v2.6.3rc1~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a7946ff35928140c323d2b289b8e24896811f04;p=thirdparty%2FPython%2Fcpython.git

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 318fa078e1dc..2ec991f0cf0a 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -240,10 +240,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 b4b07cf4d2ae..2cd983079dd7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -410,6 +410,7 @@ Inyeol Lee
 Thomas Lee
 Christopher Lee
 Luc Lefebvre
+Vincent Legoll
 Kip Lehman
 Joerg Lehmann
 Luke Kenneth Casson Leighton