Merged revisions 61203-61204 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61203 | christian.heimes | 2008-03-03 13:40:17 +0100 (Mon, 03 Mar 2008) | 3 lines

  Initialized merge tracking via "svnmerge" with revisions "1-60195" from
  svn+ssh://pythondev@svn.python.org/python/branches/trunk-math
........
  r61204 | christian.heimes | 2008-03-03 19:28:04 +0100 (Mon, 03 Mar 2008) | 1 line

  Since abc._Abstract was replaces by a new type flags the regression test suite fails. I've added a new function inspect.isabstract(). Is the mmethod fine or should I check if object is a instance of type or subclass of object, too?
........
This commit is contained in:
Christian Heimes 2008-03-03 19:18:51 +00:00
parent 180510d29b
commit be5b30b15f
4 changed files with 22 additions and 4 deletions

View file

@ -39,12 +39,16 @@ import dis
import imp
import tokenize
import linecache
from abc import ABCMeta
from operator import attrgetter
from collections import namedtuple
# These constants are from Include/code.h.
CO_OPTIMIZED, CO_NEWLOCALS, CO_VARARGS, CO_VARKEYWORDS = 0x1, 0x2, 0x4, 0x8
CO_NESTED, CO_GENERATOR, CO_NOFREE = 0x10, 0x20, 0x40
# See Include/object.h
TPFLAGS_IS_ABSTRACT = 1 << 20
# ----------------------------------------------------------- type-checking
def ismodule(object):
"""Return true if the object is a module.
@ -241,6 +245,10 @@ 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 object.__flags__ & TPFLAGS_IS_ABSTRACT
def getmembers(object, predicate=None):
"""Return all members of an object as (name, value) pairs sorted by name.
Optionally, only return members that satisfy a given predicate."""