Skip to content

P
Pyston
Commit 605702a7 authored by Kevin Modzelewski's avatar Kevin Modzelewski
Browse files
Options

Fix descriptors_nonfunc_types.py 

The unbound-instancemethod part of it is still failing, but I don't
want to gate the rest of the test on a failure that is unrelated.
parent 3c64ac96
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 90 deletions
src/runtime/objmodel.cpp
View file @ 605702a7
......@@ -3015,7 +3015,16 @@ void setattrGeneric(Box* obj, BoxedString* attr, STOLEN(Box*) val, SetattrRewrit
if (descr && _set_) {
AUTO_DECREF(val);
Box* set_rtn;
if (rewrite_args) {
// __set__ gets called differently from __get__: __get__ gets called roughly as
// descr.__class__.__get__(descr, obj)
// But __set__ gets called more like
// descr.__set__(obj, val)
// This is the same for functions, but for non-functions we have to explicitly run it
// through the descriptor protocol.
if (rewrite_args && _set_->cls == function_cls) {
r_set->addAttrGuard(offsetof(Box, cls), (uint64_t)_set_->cls);
CallRewriteArgs crewrite_args(rewrite_args->rewriter, r_set, Location::any());
crewrite_args.arg1 = r_descr;
crewrite_args.arg2 = rewrite_args->obj;
......@@ -3026,8 +3035,9 @@ void setattrGeneric(Box* obj, BoxedString* attr, STOLEN(Box*) val, SetattrRewrit
rewrite_args->out_success = true;
}
} else {
set_rtn
= runtimeCallInternal<CXX, NOT_REWRITABLE>(_set_, NULL, ArgPassSpec(3), descr, obj, val, NULL, NULL);
_set_ = processDescriptor(_set_, descr, descr->cls);
AUTO_DECREF(_set_);
set_rtn = runtimeCallInternal<CXX, NOT_REWRITABLE>(_set_, NULL, ArgPassSpec(2), obj, val, NULL, NULL, NULL);
}
Py_DECREF(set_rtn);
......@@ -5217,7 +5227,7 @@ Box* runtimeCallInternal(Box* obj, CallRewriteArgs* rewrite_args, ArgPassSpec ar
rewrite_args->obj = r_im_func;
}
// TODO: add back this instancemethod checking (see instancemethod_checking.py)
// TODO: add back this instancemethod checking (see instancemethod_checking.py)
#if 0
Box* first_arg = NULL;
if (argspec.num_args > 0) {
......
test/tests/descriptors_nonfunc_types.py
View file @ 605702a7
# expected: reffail
# See what happens when we make __get__ and __set__ things other than functions...
# TODO add some with __del__
import sys
import traceback
class CallableGet(object):
def __call__(self, a, b, c):
print 'Callable get'
print self
print a
print b
print c
def __call__(*args):
print "callable get", map(type, args)
class CallableSet(object):
def __call__(a, b, c):
print 'Callable set'
print a
print b
print c
def __get__(*args):
print "__get__", map(type, args)
return args[0]
def __call__(*args):
print "callable set", map(type, args)
class InstanceMethodMaker(object):
def getBoundInstanceMethod(self, a, b, c):
print '__get__ bound'
print a
print b
print c
def setBoundInstanceMethod(a, b, c):
print '__set__ bound'
print a
print b
print c
def getUnboundInstanceMethod(a, b, c):
print '__get__ unbound'
print a
print b
print c
def setUnboundInstanceMethod(a, b, c):
print '__set__ unbound'
print a
print b
print c
def getBoundInstanceMethod(*args):
print '__get__ bound', map(type, args)
def setBoundInstanceMethod(*args):
print '__set__ bound', map(type, args)
def getUnboundInstanceMethod(*args):
print '__get__ unbound', map(type, args)
def setUnboundInstanceMethod(*args):
print '__set__ unbound', map(type, args)
imm = InstanceMethodMaker()
def closureGet():
a = 5
def f(b, c, d):
print 'closure __get__'
print a
print b
print c
print d
def f(*args):
print 'closure __get__', map(type, args), a
return f
def closureSet():
def f(b, c, d):
print 'closure __set__'
print a
print b
print c
print d
a = 5
def f(*args):
print 'closure __set__', map(type, args), a
return f
class A(object):
......@@ -69,11 +45,8 @@ class A(object):
__set__ = 1
descSetInt = DescSetInt()
class DescGetSetInt(object):
def __get__(a, b, c):
print 'DescGetSetInt __get__ called'
print a
print b
print c
def __get__(*args):
print 'DescGetSetInt __get__ called', map(type, args)
__set__ = 1
descGetSetInt = DescGetSetInt()
......@@ -84,11 +57,8 @@ class A(object):
__set__ = CallableSet()
descSetCall = DescSetCall()
class DescGetSetCall(object):
def __get__(a, b, c):
print 'DescGetSetCall __get__ called'
print a
print b
print c
def __get__(*args):
print 'DescGetSetCall __get__ called', map(type, args)
__set__ = CallableSet()
descGetSetCall = DescGetSetCall()
......@@ -99,11 +69,8 @@ class A(object):
__set__ = imm.setBoundInstanceMethod
descSetBoundInstanceMethod = DescSetBoundInstanceMethod()
class DescGetSetBoundInstanceMethod(object):
def __get__(a, b, c):
print 'DescGetSetBoundInstanceMethod __get__ called'
print a
print b
print c
def __get__(*args):
print 'DescGetSetBoundInstanceMethod __get__ called', map(type, args)
__set__ = imm.setBoundInstanceMethod
descGetSetBoundInstanceMethod = DescGetSetBoundInstanceMethod()
......@@ -114,11 +81,8 @@ class A(object):
__set__ = InstanceMethodMaker.setUnboundInstanceMethod
descSetUnboundInstanceMethod = DescSetUnboundInstanceMethod()
class DescGetSetUnboundInstanceMethod(object):
def __get__(a, b, c):
print 'DescGetSetUnboundInstanceMethod __get__ called'
print a
print b
print c
def __get__(*args):
print 'DescGetSetUnboundInstanceMethod __get__ called', map(type, args)
__set__ = imm.setUnboundInstanceMethod
descGetSetUnboundInstanceMethod = DescGetSetUnboundInstanceMethod()
......@@ -129,29 +93,20 @@ class A(object):
__set__ = closureSet()
descSetClosure = DescSetClosure()
class DescGetSetClosure(object):
def __get__(a, b, c):
print 'DescGetSetClosure __get__ called'
print a
print b
print c
def __get__(*args):
print 'DescGetSetClosure __get__ called', map(type, args)
__set__ = closureSet()
descGetSetClosure = DescGetSetClosure()
class DescGetGenerator(object):
def __get__(self, obj, type):
print 'DescGetGenerator __get__ called'
print self
print obj
print type
def __get__(*args):
print 'DescGetGenerator __get__ called', map(type, args)
yield 15
print '__get__ post yield'
descGetGenerator = DescGetGenerator()
class DescSetGenerator(object):
def __set__(self, obj, value):
print 'DescSetGenerator __set__ called'
print self
print obj
print value
def __set__(*args):
print 'DescSetGenerator __set__ called', map(type, args)
yield 15
print '__set__ post yield'
descSetGenerator = DescSetGenerator()
......@@ -178,12 +133,12 @@ print 'int'
try:
print a.descGetInt
except:
traceback.print_exc()
traceback.print_exc(file=sys.stdout)
try:
a.descSetInt = 5
except:
traceback.print_exc()
traceback.print_exc(file=sys.stdout)
a.__dict__['descGetSetInt'] = 3
print a.descGetSetInt
......@@ -200,17 +155,20 @@ a.descSetBoundInstanceMethod = 5
a.__dict__['descGetSetBoundInstanceMethod'] = 3
print a.descGetSetBoundInstanceMethod
# TODO: uncomment this after instancemethod_checking is working
'''
print 'unbound instance method'
try:
print a.descGetUnboundInstanceMethod
except:
traceback.print_exc()
traceback.print_exc(file=sys.stdout)
try:
a.descSetUnboundInstanceMethod = 5
except:
traceback.print_exc()
traceback.print_exc(file=sys.stdout)
a.__dict__['descGetSetUnboundInstanceMethod'] = 3
print a.descGetSetUnboundInstanceMethod
'''
print 'closure'
print a.descGetClosure
......@@ -219,8 +177,8 @@ a.__dict__['descGetSetClosure'] = 3
print a.descGetClosure
print 'generator'
print a.descGetGenerator
print type(a.descGetGenerator)
a.descSetGenerator = 5
a.__dict__['descGetSetGenerator'] = 3
print a.descGetGenerator
print type(a.descGetGenerator)
test/tests/instancemethod_checking.py 0 → 100644
View file @ 605702a7
# expected: fail
class C(object):
def f(self):
print "f", self
try:
C.f()
except Exception as e:
print e
try:
C.f(1)
except Exception as e:
print e
class M(type):
pass
class M2(type):
def __new__(*args):
return type.__new__(*args)
def other(*args):
pass
print type(type.__new__)
print type(M.__new__)
print type(M2.__new__)
type.__new__(M, "my type", (object,), {})
M.__new__(M, "my type", (object,), {})
M2.__new__(M, "my type", (object,), {})
type.__new__(M2, "my type", (object,), {})
M.__new__(M2, "my type", (object,), {})
M2.__new__(M2, "my type", (object,), {})
try:
M2.other(M2, "my type", (object,), {})
except Exception as e:
print e
# for i in xrange(2):
# print C.__new__(C)
# TODO: move this back to descriptors_nonfunc_types after this is working again:
import traceback
import sys
class InstanceMethodMaker(object):
def getBoundInstanceMethod(*args):
print '__get__ bound', map(type, args)
def setBoundInstanceMethod(*args):
print '__set__ bound', map(type, args)
def getUnboundInstanceMethod(*args):
print '__get__ unbound', map(type, args)
def setUnboundInstanceMethod(*args):
print '__set__ unbound', map(type, args)
imm = InstanceMethodMaker()
class A(object):
class DescGetUnboundInstanceMethod(object):
__get__ = InstanceMethodMaker.getUnboundInstanceMethod
descGetUnboundInstanceMethod = DescGetUnboundInstanceMethod()
class DescSetUnboundInstanceMethod(object):
__set__ = InstanceMethodMaker.setUnboundInstanceMethod
descSetUnboundInstanceMethod = DescSetUnboundInstanceMethod()
class DescGetSetUnboundInstanceMethod(object):
def __get__(*args):
print 'DescGetSetUnboundInstanceMethod __get__ called', map(type, args)
__set__ = imm.setUnboundInstanceMethod
descGetSetUnboundInstanceMethod = DescGetSetUnboundInstanceMethod()
a = A()
print 'unbound instance method'
try:
print a.descGetUnboundInstanceMethod
except:
traceback.print_exc(file=sys.stdout)
try:
a.descSetUnboundInstanceMethod = 5
except:
traceback.print_exc(file=sys.stdout)
a.__dict__['descGetSetUnboundInstanceMethod'] = 3
print a.descGetSetUnboundInstanceMethod
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7