From c033942ed9b4814ec7b187b7e09185d89334be30 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 2 Aug 2009 15:51:59 +0000 Subject: 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. ........ ................ --- Lib/inspect.py | 4 ---- Misc/ACKS | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py index fe3ffc7..4b3e27a 100644 --- 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 43dcb86..644c803 100644 --- 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 -- cgit v0.12