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 318fa078e1dc3ae232d3657f6c9edfc1f362a94b..2ec991f0cf0a422f201bc2c7cfc148ac051449de 100644 (file)
--- 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 b4b07cf4d2ae9fd0e662ff257ec97a3a222df7fb..2cd983079dd7d1e8b5186295374e0b77cb76ba33 100644 (file)
--- 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