[Python-checkins] r74286 - in python/branches/release26-maint: Lib/inspect.py Misc/ACKS

Sun Aug 2 17:41:08 CEST 2009

Author: mark.dickinson
Date: Sun Aug 2 17:41:08 2009
New Revision: 74286
Log:
Merged revisions 74285 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r74285 | mark.dickinson | 2009年08月02日 16:40:11 +0100 (2009年8月02日) | 3 lines
 
 Issue #6619: Remove duplicate 'isgenerator' function from inspect module.
 Thanks Vincent Legoll.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/inspect.py
 python/branches/release26-maint/Misc/ACKS
Modified: python/branches/release26-maint/Lib/inspect.py
==============================================================================

--- python/branches/release26-maint/Lib/inspect.py	(original)
+++ python/branches/release26-maint/Lib/inspect.py	Sun Aug 2 17:41:08 2009
@@ -240,10 +240,6 @@
 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
Modified: python/branches/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS	(original)
+++ python/branches/release26-maint/Misc/ACKS	Sun Aug 2 17:41:08 2009
@@ -410,6 +410,7 @@
 Thomas Lee
 Christopher Lee
 Luc Lefebvre
+Vincent Legoll
 Kip Lehman
 Joerg Lehmann
 Luke Kenneth Casson Leighton
