mirror of
https://github.com/python/cpython
synced 2024-09-15 22:10:19 +00:00
d59da4b432
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line fix argument name in documentation; match the implementation ................ r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line Implements class decorators, PEP 3129. ................ r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines obsubmit. ................ r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines Fix bug in test_inspect. (I presume this is how it should be fixed; Jack Diedrich, please verify.) ................ r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines Remove the imageop module. With imgfile already removed in Python 3.0 and rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus third-party libraries perform the same function much better. ................ r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines Merged revisions 55324-55467 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines HTML-escape the plain traceback in cgitb's HTML output, to prevent the traceback inadvertently or maliciously closing the comment and injecting HTML into the error page. ........ r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines Port rev 55353 from Guido: Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC() fails. Will backport. ........ r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line Mention removal of some directories for obsolete platforms ........ r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines Change the maintainer of the BeOS port. ........ r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines Bug #1719995: don't use deprecated method in sets example. ........ r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines Fix bug in marshal where bad data would cause a segfault due to lack of an infinite recursion check. Contributed by Damien Miller at Google. ........ r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines Remove the gopherlib module. It has been raising a DeprecationWarning since Python 2.5. Also remove gopher support from urllib/urllib2. As both imported gopherlib the usage of the support would have raised a DeprecationWarning. ........ r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line calendar.py gets no benefit from xrange() instead of range() ........ r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines Complete deprecation of BaseException.message. Some subclasses were directly accessing the message attribute instead of using the descriptor. ........ r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines Reduce the max stack depth to see if this fixes the segfaults on Windows and some other boxes. If this is successful, this rev should be backported. I'm not sure how close to the limit we should push this. ........ r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines Set the depth to something very small to try to determine if the crashes on Windows are really due to the stack size or possibly some other problem. ........ r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines Last try for tweaking the max stack depth. 5000 was the original value, 4000 didn't work either. 1000 does work on Windows. If 2000 works, that will hopefully be a reasonable balance. ........ r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line fix argument name in documentation; match the implementation ........ r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line Verify neither dumps or loads overflow the stack and segfault. ........ r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line Backport PEP 3110's new 'except' syntax to 2.6. ........ r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line Improvements to NamedTuple's implementation, tests, and documentation ........ r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line Fix beginner mistake -- don't mix spaces and tabs. ........ r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line Clear data so random memory does not get freed. Will backport. ........ r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines Whoops, need to pay attention to those test failures. Move the clear to *before* the first use, not after. ........ r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line Give some clue as to what happened if the test fails. ........ r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines Fix docstring for add_package in site.py. ........ r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines Remove the rgbimg module. It has been deprecated since Python 2.5. ........ r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line Fix typo in example (should be backported, but my maintenance branch is woefully out of date) ........ ................ r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines Remove imageop from the Windows build process. ................ r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line Remove callable() builtin ................ r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines Merged revisions 55468-55505 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line rotor is long gone. ........ r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line Update directories/files at the top-level. ........ r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines Try to remove rgbimg from Windows builds. ........ r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines Remove the macfs module. This led to the deprecation of macostools.touched(); it completely relied on macfs and is a no-op on OS X according to code comments. ........ r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines Move imgfile import to the global namespace to trigger an import error ASAP to prevent creation of a test file. ........ r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines Cause posixfile to raise a DeprecationWarning. Documented as deprecated since Ptyhon 1.5. ........ r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line Note removed modules ........ r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines Add Alexandre Vassalotti. ........ r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines fix against r55474 [Remove the macfs module] Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex. ........ r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line Replace assertion with straight error-checking. ........ r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line Allow all alphanumeric and underscores in type and field names. ........ r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines Added timeout support to HTTPSConnection, through the socket.create_connection function. Also added a small test for this, and updated NEWS file. ........ r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines Patch #1686487: you can now pass any mapping after '**' in function calls. ........ r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line Document new params to HTTPSConnection ........ r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line Stop using METH_OLDARGS ........ r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line Stop using METH_OLDARGS implicitly ........ ................
310 lines
9.6 KiB
Python
310 lines
9.6 KiB
Python
import unittest
|
|
from test import test_support
|
|
|
|
def funcattrs(**kwds):
|
|
def decorate(func):
|
|
func.__dict__.update(kwds)
|
|
return func
|
|
return decorate
|
|
|
|
class MiscDecorators (object):
|
|
@staticmethod
|
|
def author(name):
|
|
def decorate(func):
|
|
func.__dict__['author'] = name
|
|
return func
|
|
return decorate
|
|
|
|
# -----------------------------------------------
|
|
|
|
class DbcheckError (Exception):
|
|
def __init__(self, exprstr, func, args, kwds):
|
|
# A real version of this would set attributes here
|
|
Exception.__init__(self, "dbcheck %r failed (func=%s args=%s kwds=%s)" %
|
|
(exprstr, func, args, kwds))
|
|
|
|
|
|
def dbcheck(exprstr, globals=None, locals=None):
|
|
"Decorator to implement debugging assertions"
|
|
def decorate(func):
|
|
expr = compile(exprstr, "dbcheck-%s" % func.__name__, "eval")
|
|
def check(*args, **kwds):
|
|
if not eval(expr, globals, locals):
|
|
raise DbcheckError(exprstr, func, args, kwds)
|
|
return func(*args, **kwds)
|
|
return check
|
|
return decorate
|
|
|
|
# -----------------------------------------------
|
|
|
|
def countcalls(counts):
|
|
"Decorator to count calls to a function"
|
|
def decorate(func):
|
|
func_name = func.__name__
|
|
counts[func_name] = 0
|
|
def call(*args, **kwds):
|
|
counts[func_name] += 1
|
|
return func(*args, **kwds)
|
|
call.__name__ = func_name
|
|
return call
|
|
return decorate
|
|
|
|
# -----------------------------------------------
|
|
|
|
def memoize(func):
|
|
saved = {}
|
|
def call(*args):
|
|
try:
|
|
return saved[args]
|
|
except KeyError:
|
|
res = func(*args)
|
|
saved[args] = res
|
|
return res
|
|
except TypeError:
|
|
# Unhashable argument
|
|
return func(*args)
|
|
call.__name__ = func.__name__
|
|
return call
|
|
|
|
# -----------------------------------------------
|
|
|
|
class TestDecorators(unittest.TestCase):
|
|
|
|
def test_single(self):
|
|
class C(object):
|
|
@staticmethod
|
|
def foo(): return 42
|
|
self.assertEqual(C.foo(), 42)
|
|
self.assertEqual(C().foo(), 42)
|
|
|
|
def test_staticmethod_function(self):
|
|
@staticmethod
|
|
def notamethod(x):
|
|
return x
|
|
self.assertRaises(TypeError, notamethod, 1)
|
|
|
|
def test_dotted(self):
|
|
decorators = MiscDecorators()
|
|
@decorators.author('Cleese')
|
|
def foo(): return 42
|
|
self.assertEqual(foo(), 42)
|
|
self.assertEqual(foo.author, 'Cleese')
|
|
|
|
def test_argforms(self):
|
|
# A few tests of argument passing, as we use restricted form
|
|
# of expressions for decorators.
|
|
|
|
def noteargs(*args, **kwds):
|
|
def decorate(func):
|
|
setattr(func, 'dbval', (args, kwds))
|
|
return func
|
|
return decorate
|
|
|
|
args = ( 'Now', 'is', 'the', 'time' )
|
|
kwds = dict(one=1, two=2)
|
|
@noteargs(*args, **kwds)
|
|
def f1(): return 42
|
|
self.assertEqual(f1(), 42)
|
|
self.assertEqual(f1.dbval, (args, kwds))
|
|
|
|
@noteargs('terry', 'gilliam', eric='idle', john='cleese')
|
|
def f2(): return 84
|
|
self.assertEqual(f2(), 84)
|
|
self.assertEqual(f2.dbval, (('terry', 'gilliam'),
|
|
dict(eric='idle', john='cleese')))
|
|
|
|
@noteargs(1, 2,)
|
|
def f3(): pass
|
|
self.assertEqual(f3.dbval, ((1, 2), {}))
|
|
|
|
def test_dbcheck(self):
|
|
@dbcheck('args[1] is not None')
|
|
def f(a, b):
|
|
return a + b
|
|
self.assertEqual(f(1, 2), 3)
|
|
self.assertRaises(DbcheckError, f, 1, None)
|
|
|
|
def test_memoize(self):
|
|
counts = {}
|
|
|
|
@memoize
|
|
@countcalls(counts)
|
|
def double(x):
|
|
return x * 2
|
|
self.assertEqual(double.__name__, 'double')
|
|
|
|
self.assertEqual(counts, dict(double=0))
|
|
|
|
# Only the first call with a given argument bumps the call count:
|
|
#
|
|
self.assertEqual(double(2), 4)
|
|
self.assertEqual(counts['double'], 1)
|
|
self.assertEqual(double(2), 4)
|
|
self.assertEqual(counts['double'], 1)
|
|
self.assertEqual(double(3), 6)
|
|
self.assertEqual(counts['double'], 2)
|
|
|
|
# Unhashable arguments do not get memoized:
|
|
#
|
|
self.assertEqual(double([10]), [10, 10])
|
|
self.assertEqual(counts['double'], 3)
|
|
self.assertEqual(double([10]), [10, 10])
|
|
self.assertEqual(counts['double'], 4)
|
|
|
|
def test_errors(self):
|
|
# Test syntax restrictions - these are all compile-time errors:
|
|
#
|
|
for expr in [ "1+2", "x[3]", "(1, 2)" ]:
|
|
# Sanity check: is expr is a valid expression by itself?
|
|
compile(expr, "testexpr", "exec")
|
|
|
|
codestr = "@%s\ndef f(): pass" % expr
|
|
self.assertRaises(SyntaxError, compile, codestr, "test", "exec")
|
|
|
|
# You can't put multiple decorators on a single line:
|
|
#
|
|
self.assertRaises(SyntaxError, compile,
|
|
"@f1 @f2\ndef f(): pass", "test", "exec")
|
|
|
|
# Test runtime errors
|
|
|
|
def unimp(func):
|
|
raise NotImplementedError
|
|
context = dict(nullval=None, unimp=unimp)
|
|
|
|
for expr, exc in [ ("undef", NameError),
|
|
("nullval", TypeError),
|
|
("nullval.attr", AttributeError),
|
|
("unimp", NotImplementedError)]:
|
|
codestr = "@%s\ndef f(): pass\nassert f() is None" % expr
|
|
code = compile(codestr, "test", "exec")
|
|
self.assertRaises(exc, eval, code, context)
|
|
|
|
def test_double(self):
|
|
class C(object):
|
|
@funcattrs(abc=1, xyz="haha")
|
|
@funcattrs(booh=42)
|
|
def foo(self): return 42
|
|
self.assertEqual(C().foo(), 42)
|
|
self.assertEqual(C.foo.abc, 1)
|
|
self.assertEqual(C.foo.xyz, "haha")
|
|
self.assertEqual(C.foo.booh, 42)
|
|
|
|
def test_order(self):
|
|
# Test that decorators are applied in the proper order to the function
|
|
# they are decorating.
|
|
def callnum(num):
|
|
"""Decorator factory that returns a decorator that replaces the
|
|
passed-in function with one that returns the value of 'num'"""
|
|
def deco(func):
|
|
return lambda: num
|
|
return deco
|
|
@callnum(2)
|
|
@callnum(1)
|
|
def foo(): return 42
|
|
self.assertEqual(foo(), 2,
|
|
"Application order of decorators is incorrect")
|
|
|
|
def test_eval_order(self):
|
|
# Evaluating a decorated function involves four steps for each
|
|
# decorator-maker (the function that returns a decorator):
|
|
#
|
|
# 1: Evaluate the decorator-maker name
|
|
# 2: Evaluate the decorator-maker arguments (if any)
|
|
# 3: Call the decorator-maker to make a decorator
|
|
# 4: Call the decorator
|
|
#
|
|
# When there are multiple decorators, these steps should be
|
|
# performed in the above order for each decorator, but we should
|
|
# iterate through the decorators in the reverse of the order they
|
|
# appear in the source.
|
|
|
|
actions = []
|
|
|
|
def make_decorator(tag):
|
|
actions.append('makedec' + tag)
|
|
def decorate(func):
|
|
actions.append('calldec' + tag)
|
|
return func
|
|
return decorate
|
|
|
|
class NameLookupTracer (object):
|
|
def __init__(self, index):
|
|
self.index = index
|
|
|
|
def __getattr__(self, fname):
|
|
if fname == 'make_decorator':
|
|
opname, res = ('evalname', make_decorator)
|
|
elif fname == 'arg':
|
|
opname, res = ('evalargs', str(self.index))
|
|
else:
|
|
assert False, "Unknown attrname %s" % fname
|
|
actions.append('%s%d' % (opname, self.index))
|
|
return res
|
|
|
|
c1, c2, c3 = map(NameLookupTracer, [ 1, 2, 3 ])
|
|
|
|
expected_actions = [ 'evalname1', 'evalargs1', 'makedec1',
|
|
'evalname2', 'evalargs2', 'makedec2',
|
|
'evalname3', 'evalargs3', 'makedec3',
|
|
'calldec3', 'calldec2', 'calldec1' ]
|
|
|
|
actions = []
|
|
@c1.make_decorator(c1.arg)
|
|
@c2.make_decorator(c2.arg)
|
|
@c3.make_decorator(c3.arg)
|
|
def foo(): return 42
|
|
self.assertEqual(foo(), 42)
|
|
|
|
self.assertEqual(actions, expected_actions)
|
|
|
|
# Test the equivalence claim in chapter 7 of the reference manual.
|
|
#
|
|
actions = []
|
|
def bar(): return 42
|
|
bar = c1.make_decorator(c1.arg)(c2.make_decorator(c2.arg)(c3.make_decorator(c3.arg)(bar)))
|
|
self.assertEqual(bar(), 42)
|
|
self.assertEqual(actions, expected_actions)
|
|
|
|
class TestClassDecorators(unittest.TestCase):
|
|
|
|
def test_simple(self):
|
|
def plain(x):
|
|
x.extra = 'Hello'
|
|
return x
|
|
@plain
|
|
class C(object): pass
|
|
self.assertEqual(C.extra, 'Hello')
|
|
|
|
def test_double(self):
|
|
def ten(x):
|
|
x.extra = 10
|
|
return x
|
|
def add_five(x):
|
|
x.extra += 5
|
|
return x
|
|
|
|
@add_five
|
|
@ten
|
|
class C(object): pass
|
|
self.assertEqual(C.extra, 15)
|
|
|
|
def test_order(self):
|
|
def applied_first(x):
|
|
x.extra = 'first'
|
|
return x
|
|
def applied_second(x):
|
|
x.extra = 'second'
|
|
return x
|
|
@applied_second
|
|
@applied_first
|
|
class C(object): pass
|
|
self.assertEqual(C.extra, 'second')
|
|
|
|
def test_main():
|
|
test_support.run_unittest(TestDecorators)
|
|
test_support.run_unittest(TestClassDecorators)
|
|
|
|
if __name__=="__main__":
|
|
test_main()
|