Kaydet (Commit) 6006629c authored tarafından Tim Peters's avatar Tim Peters

Remove obsolete __dynamic__ distinction.

üst 1ce150c6
...@@ -297,10 +297,9 @@ test(('m', 'method', B) in attrs, 'missing plain method') ...@@ -297,10 +297,9 @@ test(('m', 'method', B) in attrs, 'missing plain method')
test(('m1', 'method', D) in attrs, 'missing plain method') test(('m1', 'method', D) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data') test(('datablob', 'data', A) in attrs, 'missing data')
# Repeat all that, but w/ new-style non-dynamic classes. # Repeat all that, but w/ new-style classes.
class A(object): class A(object):
__dynamic__ = 0
def s(): pass def s(): pass
s = staticmethod(s) s = staticmethod(s)
...@@ -326,7 +325,6 @@ test(('m1', 'method', A) in attrs, 'missing plain method') ...@@ -326,7 +325,6 @@ test(('m1', 'method', A) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data') test(('datablob', 'data', A) in attrs, 'missing data')
class B(A): class B(A):
__dynamic__ = 0
def m(self): pass def m(self): pass
...@@ -340,7 +338,6 @@ test(('datablob', 'data', A) in attrs, 'missing data') ...@@ -340,7 +338,6 @@ test(('datablob', 'data', A) in attrs, 'missing data')
class C(A): class C(A):
__dynamic__ = 0
def m(self): pass def m(self): pass
def c(self): pass def c(self): pass
...@@ -354,76 +351,6 @@ test(('m1', 'method', A) in attrs, 'missing plain method') ...@@ -354,76 +351,6 @@ test(('m1', 'method', A) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data') test(('datablob', 'data', A) in attrs, 'missing data')
class D(B, C): class D(B, C):
__dynamic__ = 0
def m1(self): pass
attrs = attrs_wo_objs(D)
test(('s', 'static method', A) in attrs, 'missing static method')
test(('c', 'method', C) in attrs, 'missing plain method')
test(('p', 'property', A) in attrs, 'missing property')
test(('m', 'method', B) in attrs, 'missing plain method')
test(('m1', 'method', D) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data')
# And again, but w/ new-style dynamic classes.
class A(object):
__dynamic__ = 1
def s(): pass
s = staticmethod(s)
def c(cls): pass
c = classmethod(c)
def getp(self): pass
p = property(getp)
def m(self): pass
def m1(self): pass
datablob = '1'
attrs = attrs_wo_objs(A)
test(('s', 'static method', A) in attrs, 'missing static method')
test(('c', 'class method', A) in attrs, 'missing class method')
test(('p', 'property', A) in attrs, 'missing property')
test(('m', 'method', A) in attrs, 'missing plain method')
test(('m1', 'method', A) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data')
class B(A):
__dynamic__ = 1
def m(self): pass
attrs = attrs_wo_objs(B)
test(('s', 'static method', A) in attrs, 'missing static method')
test(('c', 'class method', A) in attrs, 'missing class method')
test(('p', 'property', A) in attrs, 'missing property')
test(('m', 'method', B) in attrs, 'missing plain method')
test(('m1', 'method', A) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data')
class C(A):
__dynamic__ = 1
def m(self): pass
def c(self): pass
attrs = attrs_wo_objs(C)
test(('s', 'static method', A) in attrs, 'missing static method')
test(('c', 'method', C) in attrs, 'missing plain method')
test(('p', 'property', A) in attrs, 'missing property')
test(('m', 'method', C) in attrs, 'missing plain method')
test(('m1', 'method', A) in attrs, 'missing plain method')
test(('datablob', 'data', A) in attrs, 'missing data')
class D(B, C):
__dynamic__ = 1
def m1(self): pass def m1(self): pass
......
...@@ -34,8 +34,6 @@ import xml.dom ...@@ -34,8 +34,6 @@ import xml.dom
if list is type([]): if list is type([]):
class NodeList(list): class NodeList(list):
__dynamic__ = 0
def item(self, index): def item(self, index):
if 0 <= index < len(self): if 0 <= index < len(self):
return self[index] return self[index]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment