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 9a84de3af599f4c5ff98520851cb9b2b8dae659e..79565c14378664350d6dbdcdd7980a2fead00ba2 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 97fef3d21ddd21956e32eb44f2f86e03d1660e66..a580f22b658608b2a448fb1cd3a2a91e76b3aaff 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -427,6 +427,7 @@ Thomas Lee
 Christopher Lee
 Tennessee Leeuwenburg
 Luc Lefebvre
+Vincent Legoll
 Kip Lehman
 Joerg Lehmann
 Luke Kenneth Casson Leighton