2009-04-18 17:54:08 -03:00
|
|
|
import builtins
|
2013-11-23 13:59:12 -04:00
|
|
|
import copyreg
|
2012-03-07 20:41:11 -04:00
|
|
|
import gc
|
2013-11-23 13:59:12 -04:00
|
|
|
import itertools
|
|
|
|
import math
|
|
|
|
import pickle
|
2020-12-18 20:53:50 -04:00
|
|
|
import random
|
|
|
|
import string
|
2009-05-09 15:15:04 -03:00
|
|
|
import sys
|
2008-02-05 14:13:15 -04:00
|
|
|
import types
|
|
|
|
import unittest
|
2016-12-02 02:42:43 -04:00
|
|
|
import warnings
|
2012-03-07 20:41:11 -04:00
|
|
|
import weakref
|
2001-08-02 01:15:00 -03:00
|
|
|
|
|
|
|
from copy import deepcopy
|
2022-01-08 04:14:40 -04:00
|
|
|
from contextlib import redirect_stdout
|
2008-05-20 18:35:26 -03:00
|
|
|
from test import support
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2018-10-19 18:50:06 -03:00
|
|
|
try:
|
|
|
|
import _testcapi
|
|
|
|
except ImportError:
|
|
|
|
_testcapi = None
|
|
|
|
|
2022-07-14 04:51:49 -03:00
|
|
|
try:
|
|
|
|
import xxsubtype
|
|
|
|
except ImportError:
|
|
|
|
xxsubtype = None
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class OperatorsTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
unittest.TestCase.__init__(self, *args, **kwargs)
|
|
|
|
self.binops = {
|
|
|
|
'add': '+',
|
|
|
|
'sub': '-',
|
|
|
|
'mul': '*',
|
2015-03-12 17:01:30 -03:00
|
|
|
'matmul': '@',
|
2015-03-12 16:56:08 -03:00
|
|
|
'truediv': '/',
|
|
|
|
'floordiv': '//',
|
2008-02-05 14:13:15 -04:00
|
|
|
'divmod': 'divmod',
|
|
|
|
'pow': '**',
|
|
|
|
'lshift': '<<',
|
|
|
|
'rshift': '>>',
|
|
|
|
'and': '&',
|
|
|
|
'xor': '^',
|
|
|
|
'or': '|',
|
|
|
|
'cmp': 'cmp',
|
|
|
|
'lt': '<',
|
|
|
|
'le': '<=',
|
|
|
|
'eq': '==',
|
|
|
|
'ne': '!=',
|
|
|
|
'gt': '>',
|
|
|
|
'ge': '>=',
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, expr in list(self.binops.items()):
|
|
|
|
if expr.islower():
|
|
|
|
expr = expr + "(a, b)"
|
|
|
|
else:
|
|
|
|
expr = 'a %s b' % expr
|
|
|
|
self.binops[name] = expr
|
|
|
|
|
|
|
|
self.unops = {
|
|
|
|
'pos': '+',
|
|
|
|
'neg': '-',
|
|
|
|
'abs': 'abs',
|
|
|
|
'invert': '~',
|
|
|
|
'int': 'int',
|
|
|
|
'float': 'float',
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, expr in list(self.unops.items()):
|
|
|
|
if expr.islower():
|
|
|
|
expr = expr + "(a)"
|
|
|
|
else:
|
|
|
|
expr = '%s a' % expr
|
|
|
|
self.unops[name] = expr
|
|
|
|
|
|
|
|
def unop_test(self, a, res, expr="len(a)", meth="__len__"):
|
|
|
|
d = {'a': a}
|
|
|
|
self.assertEqual(eval(expr, d), res)
|
|
|
|
t = type(a)
|
|
|
|
m = getattr(t, meth)
|
|
|
|
|
|
|
|
# Find method in parent class
|
|
|
|
while meth not in t.__dict__:
|
|
|
|
t = t.__bases__[0]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# in some implementations (e.g. PyPy), 'm' can be a regular unbound
|
|
|
|
# method object; the getattr() below obtains its underlying function.
|
|
|
|
self.assertEqual(getattr(m, 'im_func', m), t.__dict__[meth])
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(m(a), res)
|
|
|
|
bm = getattr(a, meth)
|
|
|
|
self.assertEqual(bm(), res)
|
|
|
|
|
|
|
|
def binop_test(self, a, b, res, expr="a+b", meth="__add__"):
|
|
|
|
d = {'a': a, 'b': b}
|
|
|
|
|
|
|
|
self.assertEqual(eval(expr, d), res)
|
|
|
|
t = type(a)
|
|
|
|
m = getattr(t, meth)
|
|
|
|
while meth not in t.__dict__:
|
|
|
|
t = t.__bases__[0]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# in some implementations (e.g. PyPy), 'm' can be a regular unbound
|
|
|
|
# method object; the getattr() below obtains its underlying function.
|
|
|
|
self.assertEqual(getattr(m, 'im_func', m), t.__dict__[meth])
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(m(a, b), res)
|
|
|
|
bm = getattr(a, meth)
|
|
|
|
self.assertEqual(bm(b), res)
|
|
|
|
|
|
|
|
def sliceop_test(self, a, b, c, res, expr="a[b:c]", meth="__getitem__"):
|
|
|
|
d = {'a': a, 'b': b, 'c': c}
|
|
|
|
self.assertEqual(eval(expr, d), res)
|
|
|
|
t = type(a)
|
|
|
|
m = getattr(t, meth)
|
|
|
|
while meth not in t.__dict__:
|
|
|
|
t = t.__bases__[0]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# in some implementations (e.g. PyPy), 'm' can be a regular unbound
|
|
|
|
# method object; the getattr() below obtains its underlying function.
|
|
|
|
self.assertEqual(getattr(m, 'im_func', m), t.__dict__[meth])
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(m(a, slice(b, c)), res)
|
|
|
|
bm = getattr(a, meth)
|
|
|
|
self.assertEqual(bm(slice(b, c)), res)
|
|
|
|
|
|
|
|
def setop_test(self, a, b, res, stmt="a+=b", meth="__iadd__"):
|
|
|
|
d = {'a': deepcopy(a), 'b': b}
|
|
|
|
exec(stmt, d)
|
|
|
|
self.assertEqual(d['a'], res)
|
|
|
|
t = type(a)
|
|
|
|
m = getattr(t, meth)
|
|
|
|
while meth not in t.__dict__:
|
|
|
|
t = t.__bases__[0]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# in some implementations (e.g. PyPy), 'm' can be a regular unbound
|
|
|
|
# method object; the getattr() below obtains its underlying function.
|
|
|
|
self.assertEqual(getattr(m, 'im_func', m), t.__dict__[meth])
|
2008-02-05 14:13:15 -04:00
|
|
|
d['a'] = deepcopy(a)
|
|
|
|
m(d['a'], b)
|
|
|
|
self.assertEqual(d['a'], res)
|
|
|
|
d['a'] = deepcopy(a)
|
|
|
|
bm = getattr(d['a'], meth)
|
|
|
|
bm(b)
|
|
|
|
self.assertEqual(d['a'], res)
|
|
|
|
|
|
|
|
def set2op_test(self, a, b, c, res, stmt="a[b]=c", meth="__setitem__"):
|
|
|
|
d = {'a': deepcopy(a), 'b': b, 'c': c}
|
|
|
|
exec(stmt, d)
|
|
|
|
self.assertEqual(d['a'], res)
|
|
|
|
t = type(a)
|
|
|
|
m = getattr(t, meth)
|
|
|
|
while meth not in t.__dict__:
|
|
|
|
t = t.__bases__[0]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# in some implementations (e.g. PyPy), 'm' can be a regular unbound
|
|
|
|
# method object; the getattr() below obtains its underlying function.
|
|
|
|
self.assertEqual(getattr(m, 'im_func', m), t.__dict__[meth])
|
2008-02-05 14:13:15 -04:00
|
|
|
d['a'] = deepcopy(a)
|
|
|
|
m(d['a'], b, c)
|
|
|
|
self.assertEqual(d['a'], res)
|
|
|
|
d['a'] = deepcopy(a)
|
|
|
|
bm = getattr(d['a'], meth)
|
|
|
|
bm(b, c)
|
|
|
|
self.assertEqual(d['a'], res)
|
|
|
|
|
|
|
|
def setsliceop_test(self, a, b, c, d, res, stmt="a[b:c]=d", meth="__setitem__"):
|
|
|
|
dictionary = {'a': deepcopy(a), 'b': b, 'c': c, 'd': d}
|
|
|
|
exec(stmt, dictionary)
|
|
|
|
self.assertEqual(dictionary['a'], res)
|
|
|
|
t = type(a)
|
|
|
|
while meth not in t.__dict__:
|
|
|
|
t = t.__bases__[0]
|
|
|
|
m = getattr(t, meth)
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# in some implementations (e.g. PyPy), 'm' can be a regular unbound
|
|
|
|
# method object; the getattr() below obtains its underlying function.
|
|
|
|
self.assertEqual(getattr(m, 'im_func', m), t.__dict__[meth])
|
2008-02-05 14:13:15 -04:00
|
|
|
dictionary['a'] = deepcopy(a)
|
|
|
|
m(dictionary['a'], slice(b, c), d)
|
|
|
|
self.assertEqual(dictionary['a'], res)
|
|
|
|
dictionary['a'] = deepcopy(a)
|
|
|
|
bm = getattr(dictionary['a'], meth)
|
|
|
|
bm(slice(b, c), d)
|
|
|
|
self.assertEqual(dictionary['a'], res)
|
|
|
|
|
|
|
|
def test_lists(self):
|
|
|
|
# Testing list operations...
|
|
|
|
# Asserts are within individual test methods
|
|
|
|
self.binop_test([1], [2], [1,2], "a+b", "__add__")
|
|
|
|
self.binop_test([1,2,3], 2, 1, "b in a", "__contains__")
|
|
|
|
self.binop_test([1,2,3], 4, 0, "b in a", "__contains__")
|
|
|
|
self.binop_test([1,2,3], 1, 2, "a[b]", "__getitem__")
|
|
|
|
self.sliceop_test([1,2,3], 0, 2, [1,2], "a[b:c]", "__getitem__")
|
|
|
|
self.setop_test([1], [2], [1,2], "a+=b", "__iadd__")
|
|
|
|
self.setop_test([1,2], 3, [1,2,1,2,1,2], "a*=b", "__imul__")
|
|
|
|
self.unop_test([1,2,3], 3, "len(a)", "__len__")
|
|
|
|
self.binop_test([1,2], 3, [1,2,1,2,1,2], "a*b", "__mul__")
|
|
|
|
self.binop_test([1,2], 3, [1,2,1,2,1,2], "b*a", "__rmul__")
|
|
|
|
self.set2op_test([1,2], 1, 3, [1,3], "a[b]=c", "__setitem__")
|
|
|
|
self.setsliceop_test([1,2,3,4], 1, 3, [5,6], [1,5,6,4], "a[b:c]=d",
|
|
|
|
"__setitem__")
|
|
|
|
|
|
|
|
def test_dicts(self):
|
|
|
|
# Testing dict operations...
|
|
|
|
self.binop_test({1:2,3:4}, 1, 1, "b in a", "__contains__")
|
|
|
|
self.binop_test({1:2,3:4}, 2, 0, "b in a", "__contains__")
|
|
|
|
self.binop_test({1:2,3:4}, 1, 2, "a[b]", "__getitem__")
|
|
|
|
|
|
|
|
d = {1:2, 3:4}
|
|
|
|
l1 = []
|
|
|
|
for i in list(d.keys()):
|
|
|
|
l1.append(i)
|
|
|
|
l = []
|
|
|
|
for i in iter(d):
|
|
|
|
l.append(i)
|
|
|
|
self.assertEqual(l, l1)
|
|
|
|
l = []
|
|
|
|
for i in d.__iter__():
|
|
|
|
l.append(i)
|
|
|
|
self.assertEqual(l, l1)
|
|
|
|
l = []
|
|
|
|
for i in dict.__iter__(d):
|
|
|
|
l.append(i)
|
|
|
|
self.assertEqual(l, l1)
|
|
|
|
d = {1:2, 3:4}
|
|
|
|
self.unop_test(d, 2, "len(a)", "__len__")
|
|
|
|
self.assertEqual(eval(repr(d), {}), d)
|
|
|
|
self.assertEqual(eval(d.__repr__(), {}), d)
|
|
|
|
self.set2op_test({1:2,3:4}, 2, 3, {1:2,2:3,3:4}, "a[b]=c",
|
|
|
|
"__setitem__")
|
|
|
|
|
|
|
|
# Tests for unary and binary operators
|
|
|
|
def number_operators(self, a, b, skip=[]):
|
|
|
|
dict = {'a': a, 'b': b}
|
|
|
|
|
2015-03-12 16:56:08 -03:00
|
|
|
for name, expr in self.binops.items():
|
2008-02-05 14:13:15 -04:00
|
|
|
if name not in skip:
|
|
|
|
name = "__%s__" % name
|
|
|
|
if hasattr(a, name):
|
|
|
|
res = eval(expr, dict)
|
|
|
|
self.binop_test(a, b, res, expr, name)
|
|
|
|
|
|
|
|
for name, expr in list(self.unops.items()):
|
|
|
|
if name not in skip:
|
|
|
|
name = "__%s__" % name
|
|
|
|
if hasattr(a, name):
|
|
|
|
res = eval(expr, dict)
|
|
|
|
self.unop_test(a, res, expr, name)
|
|
|
|
|
|
|
|
def test_ints(self):
|
|
|
|
# Testing int operations...
|
|
|
|
self.number_operators(100, 3)
|
|
|
|
# The following crashes in Python 2.2
|
|
|
|
self.assertEqual((1).__bool__(), 1)
|
|
|
|
self.assertEqual((0).__bool__(), 0)
|
|
|
|
# This returns 'NotImplemented' in Python 2.2
|
|
|
|
class C(int):
|
|
|
|
def __add__(self, other):
|
|
|
|
return NotImplemented
|
|
|
|
self.assertEqual(C(5), 5)
|
|
|
|
try:
|
|
|
|
C() + ""
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("NotImplemented should have caused TypeError")
|
|
|
|
|
|
|
|
def test_floats(self):
|
|
|
|
# Testing float operations...
|
|
|
|
self.number_operators(100.0, 3.0)
|
|
|
|
|
|
|
|
def test_complexes(self):
|
|
|
|
# Testing complex operations...
|
|
|
|
self.number_operators(100.0j, 3.0j, skip=['lt', 'le', 'gt', 'ge',
|
2009-12-05 16:28:34 -04:00
|
|
|
'int', 'float',
|
2015-03-12 16:56:08 -03:00
|
|
|
'floordiv', 'divmod', 'mod'])
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class Number(complex):
|
|
|
|
__slots__ = ['prec']
|
|
|
|
def __new__(cls, *args, **kwds):
|
|
|
|
result = complex.__new__(cls, *args)
|
|
|
|
result.prec = kwds.get('prec', 12)
|
|
|
|
return result
|
|
|
|
def __repr__(self):
|
|
|
|
prec = self.prec
|
|
|
|
if self.imag == 0.0:
|
|
|
|
return "%.*g" % (prec, self.real)
|
|
|
|
if self.real == 0.0:
|
|
|
|
return "%.*gj" % (prec, self.imag)
|
|
|
|
return "(%.*g+%.*gj)" % (prec, self.real, prec, self.imag)
|
|
|
|
__str__ = __repr__
|
|
|
|
|
|
|
|
a = Number(3.14, prec=6)
|
|
|
|
self.assertEqual(repr(a), "3.14")
|
|
|
|
self.assertEqual(a.prec, 6)
|
|
|
|
|
|
|
|
a = Number(a, prec=2)
|
|
|
|
self.assertEqual(repr(a), "3.1")
|
|
|
|
self.assertEqual(a.prec, 2)
|
|
|
|
|
|
|
|
a = Number(234.5)
|
|
|
|
self.assertEqual(repr(a), "234.5")
|
|
|
|
self.assertEqual(a.prec, 12)
|
|
|
|
|
2010-09-23 17:11:19 -03:00
|
|
|
def test_explicit_reverse_methods(self):
|
|
|
|
# see issue 9930
|
|
|
|
self.assertEqual(complex.__radd__(3j, 4.0), complex(4.0, 3.0))
|
|
|
|
self.assertEqual(float.__rsub__(3.0, 1), -2.0)
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
@support.impl_detail("the module 'xxsubtype' is internal")
|
2022-07-14 04:51:49 -03:00
|
|
|
@unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_spam_lists(self):
|
|
|
|
# Testing spamlist operations...
|
|
|
|
import copy, xxsubtype as spam
|
|
|
|
|
|
|
|
def spamlist(l, memo=None):
|
|
|
|
import xxsubtype as spam
|
|
|
|
return spam.spamlist(l)
|
|
|
|
|
|
|
|
# This is an ugly hack:
|
|
|
|
copy._deepcopy_dispatch[spam.spamlist] = spamlist
|
|
|
|
|
|
|
|
self.binop_test(spamlist([1]), spamlist([2]), spamlist([1,2]), "a+b",
|
|
|
|
"__add__")
|
|
|
|
self.binop_test(spamlist([1,2,3]), 2, 1, "b in a", "__contains__")
|
|
|
|
self.binop_test(spamlist([1,2,3]), 4, 0, "b in a", "__contains__")
|
|
|
|
self.binop_test(spamlist([1,2,3]), 1, 2, "a[b]", "__getitem__")
|
|
|
|
self.sliceop_test(spamlist([1,2,3]), 0, 2, spamlist([1,2]), "a[b:c]",
|
|
|
|
"__getitem__")
|
|
|
|
self.setop_test(spamlist([1]), spamlist([2]), spamlist([1,2]), "a+=b",
|
|
|
|
"__iadd__")
|
|
|
|
self.setop_test(spamlist([1,2]), 3, spamlist([1,2,1,2,1,2]), "a*=b",
|
|
|
|
"__imul__")
|
|
|
|
self.unop_test(spamlist([1,2,3]), 3, "len(a)", "__len__")
|
|
|
|
self.binop_test(spamlist([1,2]), 3, spamlist([1,2,1,2,1,2]), "a*b",
|
|
|
|
"__mul__")
|
|
|
|
self.binop_test(spamlist([1,2]), 3, spamlist([1,2,1,2,1,2]), "b*a",
|
|
|
|
"__rmul__")
|
|
|
|
self.set2op_test(spamlist([1,2]), 1, 3, spamlist([1,3]), "a[b]=c",
|
|
|
|
"__setitem__")
|
|
|
|
self.setsliceop_test(spamlist([1,2,3,4]), 1, 3, spamlist([5,6]),
|
|
|
|
spamlist([1,5,6,4]), "a[b:c]=d", "__setitem__")
|
|
|
|
# Test subclassing
|
|
|
|
class C(spam.spamlist):
|
|
|
|
def foo(self): return 1
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a, [])
|
|
|
|
self.assertEqual(a.foo(), 1)
|
|
|
|
a.append(100)
|
|
|
|
self.assertEqual(a, [100])
|
|
|
|
self.assertEqual(a.getstate(), 0)
|
|
|
|
a.setstate(42)
|
|
|
|
self.assertEqual(a.getstate(), 42)
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
@support.impl_detail("the module 'xxsubtype' is internal")
|
2022-07-14 04:51:49 -03:00
|
|
|
@unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_spam_dicts(self):
|
|
|
|
# Testing spamdict operations...
|
|
|
|
import copy, xxsubtype as spam
|
|
|
|
def spamdict(d, memo=None):
|
|
|
|
import xxsubtype as spam
|
|
|
|
sd = spam.spamdict()
|
|
|
|
for k, v in list(d.items()):
|
|
|
|
sd[k] = v
|
|
|
|
return sd
|
|
|
|
# This is an ugly hack:
|
|
|
|
copy._deepcopy_dispatch[spam.spamdict] = spamdict
|
|
|
|
|
|
|
|
self.binop_test(spamdict({1:2,3:4}), 1, 1, "b in a", "__contains__")
|
|
|
|
self.binop_test(spamdict({1:2,3:4}), 2, 0, "b in a", "__contains__")
|
|
|
|
self.binop_test(spamdict({1:2,3:4}), 1, 2, "a[b]", "__getitem__")
|
|
|
|
d = spamdict({1:2,3:4})
|
|
|
|
l1 = []
|
|
|
|
for i in list(d.keys()):
|
|
|
|
l1.append(i)
|
|
|
|
l = []
|
|
|
|
for i in iter(d):
|
|
|
|
l.append(i)
|
|
|
|
self.assertEqual(l, l1)
|
|
|
|
l = []
|
|
|
|
for i in d.__iter__():
|
|
|
|
l.append(i)
|
|
|
|
self.assertEqual(l, l1)
|
|
|
|
l = []
|
|
|
|
for i in type(spamdict({})).__iter__(d):
|
|
|
|
l.append(i)
|
|
|
|
self.assertEqual(l, l1)
|
|
|
|
straightd = {1:2, 3:4}
|
|
|
|
spamd = spamdict(straightd)
|
|
|
|
self.unop_test(spamd, 2, "len(a)", "__len__")
|
|
|
|
self.unop_test(spamd, repr(straightd), "repr(a)", "__repr__")
|
|
|
|
self.set2op_test(spamdict({1:2,3:4}), 2, 3, spamdict({1:2,2:3,3:4}),
|
|
|
|
"a[b]=c", "__setitem__")
|
|
|
|
# Test subclassing
|
|
|
|
class C(spam.spamdict):
|
|
|
|
def foo(self): return 1
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(list(a.items()), [])
|
|
|
|
self.assertEqual(a.foo(), 1)
|
|
|
|
a['foo'] = 'bar'
|
|
|
|
self.assertEqual(list(a.items()), [('foo', 'bar')])
|
|
|
|
self.assertEqual(a.getstate(), 0)
|
|
|
|
a.setstate(100)
|
|
|
|
self.assertEqual(a.getstate(), 100)
|
|
|
|
|
2019-05-28 09:55:29 -03:00
|
|
|
def test_wrap_lenfunc_bad_cast(self):
|
|
|
|
self.assertEqual(range(sys.maxsize).__len__(), sys.maxsize)
|
|
|
|
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class ClassPropertiesAndMethods(unittest.TestCase):
|
|
|
|
|
2013-11-17 17:38:50 -04:00
|
|
|
def assertHasAttr(self, obj, name):
|
|
|
|
self.assertTrue(hasattr(obj, name),
|
|
|
|
'%r has no attribute %r' % (obj, name))
|
|
|
|
|
|
|
|
def assertNotHasAttr(self, obj, name):
|
|
|
|
self.assertFalse(hasattr(obj, name),
|
|
|
|
'%r has unexpected attribute %r' % (obj, name))
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_python_dicts(self):
|
|
|
|
# Testing Python subclass of dict...
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(issubclass(dict, dict))
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance({}, dict)
|
2008-02-05 14:13:15 -04:00
|
|
|
d = dict()
|
|
|
|
self.assertEqual(d, {})
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(d.__class__, dict)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(d, dict)
|
2008-02-05 14:13:15 -04:00
|
|
|
class C(dict):
|
|
|
|
state = -1
|
|
|
|
def __init__(self_local, *a, **kw):
|
|
|
|
if a:
|
|
|
|
self.assertEqual(len(a), 1)
|
|
|
|
self_local.state = a[0]
|
|
|
|
if kw:
|
|
|
|
for k, v in list(kw.items()):
|
|
|
|
self_local[v] = k
|
|
|
|
def __getitem__(self, key):
|
|
|
|
return self.get(key, 0)
|
|
|
|
def __setitem__(self_local, key, value):
|
2022-05-08 11:10:11 -03:00
|
|
|
self.assertIsInstance(key, int)
|
2008-02-05 14:13:15 -04:00
|
|
|
dict.__setitem__(self_local, key, value)
|
|
|
|
def setstate(self, state):
|
|
|
|
self.state = state
|
|
|
|
def getstate(self):
|
|
|
|
return self.state
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(issubclass(C, dict))
|
2008-02-05 14:13:15 -04:00
|
|
|
a1 = C(12)
|
|
|
|
self.assertEqual(a1.state, 12)
|
|
|
|
a2 = C(foo=1, bar=2)
|
|
|
|
self.assertEqual(a2[1] == 'foo' and a2[2], 'bar')
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a.state, -1)
|
|
|
|
self.assertEqual(a.getstate(), -1)
|
|
|
|
a.setstate(0)
|
|
|
|
self.assertEqual(a.state, 0)
|
|
|
|
self.assertEqual(a.getstate(), 0)
|
|
|
|
a.setstate(10)
|
|
|
|
self.assertEqual(a.state, 10)
|
|
|
|
self.assertEqual(a.getstate(), 10)
|
|
|
|
self.assertEqual(a[42], 0)
|
|
|
|
a[42] = 24
|
|
|
|
self.assertEqual(a[42], 24)
|
|
|
|
N = 50
|
|
|
|
for i in range(N):
|
|
|
|
a[i] = C()
|
|
|
|
for j in range(N):
|
|
|
|
a[i][j] = i*j
|
|
|
|
for i in range(N):
|
|
|
|
for j in range(N):
|
|
|
|
self.assertEqual(a[i][j], i*j)
|
|
|
|
|
|
|
|
def test_python_lists(self):
|
|
|
|
# Testing Python subclass of list...
|
|
|
|
class C(list):
|
|
|
|
def __getitem__(self, i):
|
|
|
|
if isinstance(i, slice):
|
|
|
|
return i.start, i.stop
|
|
|
|
return list.__getitem__(self, i) + 100
|
|
|
|
a = C()
|
|
|
|
a.extend([0,1,2])
|
|
|
|
self.assertEqual(a[0], 100)
|
|
|
|
self.assertEqual(a[1], 101)
|
|
|
|
self.assertEqual(a[2], 102)
|
|
|
|
self.assertEqual(a[100:200], (100,200))
|
|
|
|
|
|
|
|
def test_metaclass(self):
|
2008-05-27 17:34:09 -03:00
|
|
|
# Testing metaclasses...
|
2008-02-05 14:13:15 -04:00
|
|
|
class C(metaclass=type):
|
|
|
|
def __init__(self):
|
|
|
|
self.__state = 0
|
|
|
|
def getstate(self):
|
|
|
|
return self.__state
|
|
|
|
def setstate(self, state):
|
|
|
|
self.__state = state
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a.getstate(), 0)
|
|
|
|
a.setstate(10)
|
|
|
|
self.assertEqual(a.getstate(), 10)
|
|
|
|
class _metaclass(type):
|
|
|
|
def myself(cls): return cls
|
|
|
|
class D(metaclass=_metaclass):
|
|
|
|
pass
|
|
|
|
self.assertEqual(D.myself(), D)
|
|
|
|
d = D()
|
|
|
|
self.assertEqual(d.__class__, D)
|
|
|
|
class M1(type):
|
|
|
|
def __new__(cls, name, bases, dict):
|
|
|
|
dict['__spam__'] = 1
|
|
|
|
return type.__new__(cls, name, bases, dict)
|
|
|
|
class C(metaclass=M1):
|
|
|
|
pass
|
|
|
|
self.assertEqual(C.__spam__, 1)
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(c.__spam__, 1)
|
|
|
|
|
|
|
|
class _instance(object):
|
|
|
|
pass
|
|
|
|
class M2(object):
|
|
|
|
@staticmethod
|
|
|
|
def __new__(cls, name, bases, dict):
|
|
|
|
self = object.__new__(cls)
|
|
|
|
self.name = name
|
|
|
|
self.bases = bases
|
|
|
|
self.dict = dict
|
|
|
|
return self
|
|
|
|
def __call__(self):
|
|
|
|
it = _instance()
|
|
|
|
# Early binding of methods
|
|
|
|
for key in self.dict:
|
|
|
|
if key.startswith("__"):
|
|
|
|
continue
|
|
|
|
setattr(it, key, self.dict[key].__get__(it, self))
|
|
|
|
return it
|
|
|
|
class C(metaclass=M2):
|
|
|
|
def spam(self):
|
|
|
|
return 42
|
|
|
|
self.assertEqual(C.name, 'C')
|
|
|
|
self.assertEqual(C.bases, ())
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn('spam', C.dict)
|
2008-02-05 14:13:15 -04:00
|
|
|
c = C()
|
|
|
|
self.assertEqual(c.spam(), 42)
|
|
|
|
|
|
|
|
# More metaclass examples
|
|
|
|
|
|
|
|
class autosuper(type):
|
|
|
|
# Automatically add __super to the class
|
|
|
|
# This trick only works for dynamic classes
|
|
|
|
def __new__(metaclass, name, bases, dict):
|
|
|
|
cls = super(autosuper, metaclass).__new__(metaclass,
|
|
|
|
name, bases, dict)
|
|
|
|
# Name mangling for __super removes leading underscores
|
|
|
|
while name[:1] == "_":
|
|
|
|
name = name[1:]
|
|
|
|
if name:
|
|
|
|
name = "_%s__super" % name
|
|
|
|
else:
|
|
|
|
name = "__super"
|
|
|
|
setattr(cls, name, super(cls))
|
|
|
|
return cls
|
|
|
|
class A(metaclass=autosuper):
|
|
|
|
def meth(self):
|
|
|
|
return "A"
|
|
|
|
class B(A):
|
|
|
|
def meth(self):
|
|
|
|
return "B" + self.__super.meth()
|
|
|
|
class C(A):
|
|
|
|
def meth(self):
|
|
|
|
return "C" + self.__super.meth()
|
|
|
|
class D(C, B):
|
|
|
|
def meth(self):
|
|
|
|
return "D" + self.__super.meth()
|
|
|
|
self.assertEqual(D().meth(), "DCBA")
|
|
|
|
class E(B, C):
|
|
|
|
def meth(self):
|
|
|
|
return "E" + self.__super.meth()
|
|
|
|
self.assertEqual(E().meth(), "EBCA")
|
|
|
|
|
|
|
|
class autoproperty(type):
|
|
|
|
# Automatically create property attributes when methods
|
|
|
|
# named _get_x and/or _set_x are found
|
|
|
|
def __new__(metaclass, name, bases, dict):
|
|
|
|
hits = {}
|
|
|
|
for key, val in dict.items():
|
|
|
|
if key.startswith("_get_"):
|
|
|
|
key = key[5:]
|
|
|
|
get, set = hits.get(key, (None, None))
|
|
|
|
get = val
|
|
|
|
hits[key] = get, set
|
|
|
|
elif key.startswith("_set_"):
|
|
|
|
key = key[5:]
|
|
|
|
get, set = hits.get(key, (None, None))
|
|
|
|
set = val
|
|
|
|
hits[key] = get, set
|
|
|
|
for key, (get, set) in hits.items():
|
|
|
|
dict[key] = property(get, set)
|
|
|
|
return super(autoproperty, metaclass).__new__(metaclass,
|
|
|
|
name, bases, dict)
|
|
|
|
class A(metaclass=autoproperty):
|
|
|
|
def _get_x(self):
|
|
|
|
return -self.__x
|
|
|
|
def _set_x(self, x):
|
|
|
|
self.__x = -x
|
|
|
|
a = A()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "x")
|
2008-02-05 14:13:15 -04:00
|
|
|
a.x = 12
|
|
|
|
self.assertEqual(a.x, 12)
|
|
|
|
self.assertEqual(a._A__x, -12)
|
|
|
|
|
|
|
|
class multimetaclass(autoproperty, autosuper):
|
|
|
|
# Merge of multiple cooperating metaclasses
|
|
|
|
pass
|
|
|
|
class A(metaclass=multimetaclass):
|
|
|
|
def _get_x(self):
|
|
|
|
return "A"
|
|
|
|
class B(A):
|
|
|
|
def _get_x(self):
|
|
|
|
return "B" + self.__super._get_x()
|
|
|
|
class C(A):
|
|
|
|
def _get_x(self):
|
|
|
|
return "C" + self.__super._get_x()
|
|
|
|
class D(C, B):
|
|
|
|
def _get_x(self):
|
|
|
|
return "D" + self.__super._get_x()
|
|
|
|
self.assertEqual(D().x, "DCBA")
|
|
|
|
|
|
|
|
# Make sure type(x) doesn't call x.__class__.__init__
|
|
|
|
class T(type):
|
|
|
|
counter = 0
|
|
|
|
def __init__(self, *args):
|
|
|
|
T.counter += 1
|
|
|
|
class C(metaclass=T):
|
|
|
|
pass
|
|
|
|
self.assertEqual(T.counter, 1)
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(type(a), C)
|
|
|
|
self.assertEqual(T.counter, 1)
|
|
|
|
|
|
|
|
class C(object): pass
|
|
|
|
c = C()
|
|
|
|
try: c()
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("calling object w/o call method should raise "
|
|
|
|
"TypeError")
|
|
|
|
|
|
|
|
# Testing code to find most derived baseclass
|
|
|
|
class A(type):
|
|
|
|
def __new__(*args, **kwargs):
|
|
|
|
return type.__new__(*args, **kwargs)
|
|
|
|
|
|
|
|
class B(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class C(object, metaclass=A):
|
|
|
|
pass
|
|
|
|
|
|
|
|
# The most derived metaclass of D is A rather than type.
|
|
|
|
class D(B, C):
|
|
|
|
pass
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertIs(A, type(D))
|
|
|
|
|
|
|
|
# issue1294232: correct metaclass calculation
|
|
|
|
new_calls = [] # to check the order of __new__ calls
|
|
|
|
class AMeta(type):
|
|
|
|
@staticmethod
|
|
|
|
def __new__(mcls, name, bases, ns):
|
|
|
|
new_calls.append('AMeta')
|
|
|
|
return super().__new__(mcls, name, bases, ns)
|
|
|
|
@classmethod
|
|
|
|
def __prepare__(mcls, name, bases):
|
|
|
|
return {}
|
|
|
|
|
|
|
|
class BMeta(AMeta):
|
|
|
|
@staticmethod
|
|
|
|
def __new__(mcls, name, bases, ns):
|
|
|
|
new_calls.append('BMeta')
|
|
|
|
return super().__new__(mcls, name, bases, ns)
|
|
|
|
@classmethod
|
|
|
|
def __prepare__(mcls, name, bases):
|
|
|
|
ns = super().__prepare__(name, bases)
|
|
|
|
ns['BMeta_was_here'] = True
|
|
|
|
return ns
|
|
|
|
|
|
|
|
class A(metaclass=AMeta):
|
|
|
|
pass
|
|
|
|
self.assertEqual(['AMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class B(metaclass=BMeta):
|
|
|
|
pass
|
|
|
|
# BMeta.__new__ calls AMeta.__new__ with super:
|
|
|
|
self.assertEqual(['BMeta', 'AMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class C(A, B):
|
|
|
|
pass
|
|
|
|
# The most derived metaclass is BMeta:
|
|
|
|
self.assertEqual(['BMeta', 'AMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
# BMeta.__prepare__ should've been called:
|
|
|
|
self.assertIn('BMeta_was_here', C.__dict__)
|
|
|
|
|
|
|
|
# The order of the bases shouldn't matter:
|
|
|
|
class C2(B, A):
|
|
|
|
pass
|
|
|
|
self.assertEqual(['BMeta', 'AMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertIn('BMeta_was_here', C2.__dict__)
|
|
|
|
|
|
|
|
# Check correct metaclass calculation when a metaclass is declared:
|
|
|
|
class D(C, metaclass=type):
|
|
|
|
pass
|
|
|
|
self.assertEqual(['BMeta', 'AMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertIn('BMeta_was_here', D.__dict__)
|
|
|
|
|
|
|
|
class E(C, metaclass=AMeta):
|
|
|
|
pass
|
|
|
|
self.assertEqual(['BMeta', 'AMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertIn('BMeta_was_here', E.__dict__)
|
|
|
|
|
|
|
|
# Special case: the given metaclass isn't a class,
|
|
|
|
# so there is no metaclass calculation.
|
|
|
|
marker = object()
|
|
|
|
def func(*args, **kwargs):
|
|
|
|
return marker
|
|
|
|
class X(metaclass=func):
|
|
|
|
pass
|
|
|
|
class Y(object, metaclass=func):
|
|
|
|
pass
|
|
|
|
class Z(D, metaclass=func):
|
|
|
|
pass
|
|
|
|
self.assertIs(marker, X)
|
|
|
|
self.assertIs(marker, Y)
|
|
|
|
self.assertIs(marker, Z)
|
|
|
|
|
|
|
|
# The given metaclass is a class,
|
|
|
|
# but not a descendant of type.
|
|
|
|
prepare_calls = [] # to track __prepare__ calls
|
|
|
|
class ANotMeta:
|
|
|
|
def __new__(mcls, *args, **kwargs):
|
|
|
|
new_calls.append('ANotMeta')
|
|
|
|
return super().__new__(mcls)
|
|
|
|
@classmethod
|
|
|
|
def __prepare__(mcls, name, bases):
|
|
|
|
prepare_calls.append('ANotMeta')
|
|
|
|
return {}
|
|
|
|
class BNotMeta(ANotMeta):
|
|
|
|
def __new__(mcls, *args, **kwargs):
|
|
|
|
new_calls.append('BNotMeta')
|
|
|
|
return super().__new__(mcls)
|
|
|
|
@classmethod
|
|
|
|
def __prepare__(mcls, name, bases):
|
|
|
|
prepare_calls.append('BNotMeta')
|
|
|
|
return super().__prepare__(name, bases)
|
|
|
|
|
|
|
|
class A(metaclass=ANotMeta):
|
|
|
|
pass
|
|
|
|
self.assertIs(ANotMeta, type(A))
|
|
|
|
self.assertEqual(['ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class B(metaclass=BNotMeta):
|
|
|
|
pass
|
|
|
|
self.assertIs(BNotMeta, type(B))
|
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class C(A, B):
|
|
|
|
pass
|
|
|
|
self.assertIs(BNotMeta, type(C))
|
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class C2(B, A):
|
|
|
|
pass
|
|
|
|
self.assertIs(BNotMeta, type(C2))
|
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
# This is a TypeError, because of a metaclass conflict:
|
|
|
|
# BNotMeta is neither a subclass, nor a superclass of type
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class D(C, metaclass=type):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class E(C, metaclass=ANotMeta):
|
|
|
|
pass
|
|
|
|
self.assertIs(BNotMeta, type(E))
|
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class F(object(), C):
|
|
|
|
pass
|
|
|
|
self.assertIs(BNotMeta, type(F))
|
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
class F2(C, object()):
|
|
|
|
pass
|
|
|
|
self.assertIs(BNotMeta, type(F2))
|
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], new_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
new_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
self.assertEqual(['BNotMeta', 'ANotMeta'], prepare_calls)
|
2011-10-23 09:36:42 -03:00
|
|
|
prepare_calls.clear()
|
2011-10-23 09:04:16 -03:00
|
|
|
|
|
|
|
# TypeError: BNotMeta is neither a
|
|
|
|
# subclass, nor a superclass of int
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(C, int()):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(int(), C):
|
|
|
|
pass
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_module_subclasses(self):
|
|
|
|
# Testing Python subclass of module...
|
|
|
|
log = []
|
|
|
|
MT = type(sys)
|
|
|
|
class MM(MT):
|
|
|
|
def __init__(self, name):
|
|
|
|
MT.__init__(self, name)
|
|
|
|
def __getattribute__(self, name):
|
|
|
|
log.append(("getattr", name))
|
|
|
|
return MT.__getattribute__(self, name)
|
|
|
|
def __setattr__(self, name, value):
|
|
|
|
log.append(("setattr", name, value))
|
|
|
|
MT.__setattr__(self, name, value)
|
|
|
|
def __delattr__(self, name):
|
|
|
|
log.append(("delattr", name))
|
|
|
|
MT.__delattr__(self, name)
|
|
|
|
a = MM("a")
|
|
|
|
a.foo = 12
|
|
|
|
x = a.foo
|
|
|
|
del a.foo
|
|
|
|
self.assertEqual(log, [("setattr", "foo", 12),
|
|
|
|
("getattr", "foo"),
|
|
|
|
("delattr", "foo")])
|
|
|
|
|
2022-08-04 13:12:35 -03:00
|
|
|
# https://bugs.python.org/issue1174712
|
2008-02-05 14:13:15 -04:00
|
|
|
try:
|
|
|
|
class Module(types.ModuleType, str):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("inheriting from ModuleType and str at the same time "
|
|
|
|
"should fail")
|
|
|
|
|
2020-12-18 20:53:50 -04:00
|
|
|
# Issue 34805: Verify that definition order is retained
|
|
|
|
def random_name():
|
|
|
|
return ''.join(random.choices(string.ascii_letters, k=10))
|
|
|
|
class A:
|
|
|
|
pass
|
|
|
|
subclasses = [type(random_name(), (A,), {}) for i in range(100)]
|
|
|
|
self.assertEqual(A.__subclasses__(), subclasses)
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_multiple_inheritance(self):
|
|
|
|
# Testing multiple inheritance...
|
|
|
|
class C(object):
|
|
|
|
def __init__(self):
|
|
|
|
self.__state = 0
|
|
|
|
def getstate(self):
|
|
|
|
return self.__state
|
|
|
|
def setstate(self, state):
|
|
|
|
self.__state = state
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a.getstate(), 0)
|
|
|
|
a.setstate(10)
|
|
|
|
self.assertEqual(a.getstate(), 10)
|
|
|
|
class D(dict, C):
|
|
|
|
def __init__(self):
|
2022-05-08 11:10:11 -03:00
|
|
|
dict.__init__(self)
|
2008-02-05 14:13:15 -04:00
|
|
|
C.__init__(self)
|
|
|
|
d = D()
|
|
|
|
self.assertEqual(list(d.keys()), [])
|
|
|
|
d["hello"] = "world"
|
|
|
|
self.assertEqual(list(d.items()), [("hello", "world")])
|
|
|
|
self.assertEqual(d["hello"], "world")
|
|
|
|
self.assertEqual(d.getstate(), 0)
|
|
|
|
d.setstate(10)
|
|
|
|
self.assertEqual(d.getstate(), 10)
|
|
|
|
self.assertEqual(D.__mro__, (D, dict, C, object))
|
|
|
|
|
|
|
|
# SF bug #442833
|
|
|
|
class Node(object):
|
|
|
|
def __int__(self):
|
|
|
|
return int(self.foo())
|
|
|
|
def foo(self):
|
|
|
|
return "23"
|
|
|
|
class Frag(Node, list):
|
|
|
|
def foo(self):
|
|
|
|
return "42"
|
|
|
|
self.assertEqual(Node().__int__(), 23)
|
|
|
|
self.assertEqual(int(Node()), 23)
|
|
|
|
self.assertEqual(Frag().__int__(), 42)
|
|
|
|
self.assertEqual(int(Frag()), 42)
|
|
|
|
|
2016-08-30 14:47:49 -03:00
|
|
|
def test_diamond_inheritance(self):
|
2008-02-05 14:13:15 -04:00
|
|
|
# Testing multiple inheritance special cases...
|
|
|
|
class A(object):
|
|
|
|
def spam(self): return "A"
|
|
|
|
self.assertEqual(A().spam(), "A")
|
|
|
|
class B(A):
|
|
|
|
def boo(self): return "B"
|
|
|
|
def spam(self): return "B"
|
|
|
|
self.assertEqual(B().spam(), "B")
|
|
|
|
self.assertEqual(B().boo(), "B")
|
|
|
|
class C(A):
|
|
|
|
def boo(self): return "C"
|
|
|
|
self.assertEqual(C().spam(), "A")
|
|
|
|
self.assertEqual(C().boo(), "C")
|
|
|
|
class D(B, C): pass
|
|
|
|
self.assertEqual(D().spam(), "B")
|
|
|
|
self.assertEqual(D().boo(), "B")
|
|
|
|
self.assertEqual(D.__mro__, (D, B, C, A, object))
|
|
|
|
class E(C, B): pass
|
|
|
|
self.assertEqual(E().spam(), "B")
|
|
|
|
self.assertEqual(E().boo(), "C")
|
|
|
|
self.assertEqual(E.__mro__, (E, C, B, A, object))
|
|
|
|
# MRO order disagreement
|
|
|
|
try:
|
|
|
|
class F(D, E): pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected MRO order disagreement (F)")
|
|
|
|
try:
|
|
|
|
class G(E, D): pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected MRO order disagreement (G)")
|
|
|
|
|
|
|
|
# see thread python-dev/2002-October/029035.html
|
|
|
|
def test_ex5_from_c3_switch(self):
|
|
|
|
# Testing ex5 from C3 switch discussion...
|
|
|
|
class A(object): pass
|
|
|
|
class B(object): pass
|
|
|
|
class C(object): pass
|
|
|
|
class X(A): pass
|
|
|
|
class Y(A): pass
|
|
|
|
class Z(X,B,Y,C): pass
|
|
|
|
self.assertEqual(Z.__mro__, (Z, X, B, Y, A, C, object))
|
|
|
|
|
|
|
|
# see "A Monotonic Superclass Linearization for Dylan",
|
|
|
|
# by Kim Barrett et al. (OOPSLA 1996)
|
|
|
|
def test_monotonicity(self):
|
|
|
|
# Testing MRO monotonicity...
|
|
|
|
class Boat(object): pass
|
|
|
|
class DayBoat(Boat): pass
|
|
|
|
class WheelBoat(Boat): pass
|
|
|
|
class EngineLess(DayBoat): pass
|
|
|
|
class SmallMultihull(DayBoat): pass
|
|
|
|
class PedalWheelBoat(EngineLess,WheelBoat): pass
|
|
|
|
class SmallCatamaran(SmallMultihull): pass
|
|
|
|
class Pedalo(PedalWheelBoat,SmallCatamaran): pass
|
|
|
|
|
|
|
|
self.assertEqual(PedalWheelBoat.__mro__,
|
|
|
|
(PedalWheelBoat, EngineLess, DayBoat, WheelBoat, Boat, object))
|
|
|
|
self.assertEqual(SmallCatamaran.__mro__,
|
|
|
|
(SmallCatamaran, SmallMultihull, DayBoat, Boat, object))
|
|
|
|
self.assertEqual(Pedalo.__mro__,
|
|
|
|
(Pedalo, PedalWheelBoat, EngineLess, SmallCatamaran,
|
|
|
|
SmallMultihull, DayBoat, WheelBoat, Boat, object))
|
|
|
|
|
|
|
|
# see "A Monotonic Superclass Linearization for Dylan",
|
|
|
|
# by Kim Barrett et al. (OOPSLA 1996)
|
|
|
|
def test_consistency_with_epg(self):
|
2011-03-15 00:18:48 -03:00
|
|
|
# Testing consistency with EPG...
|
2008-02-05 14:13:15 -04:00
|
|
|
class Pane(object): pass
|
|
|
|
class ScrollingMixin(object): pass
|
|
|
|
class EditingMixin(object): pass
|
|
|
|
class ScrollablePane(Pane,ScrollingMixin): pass
|
|
|
|
class EditablePane(Pane,EditingMixin): pass
|
|
|
|
class EditableScrollablePane(ScrollablePane,EditablePane): pass
|
|
|
|
|
|
|
|
self.assertEqual(EditableScrollablePane.__mro__,
|
|
|
|
(EditableScrollablePane, ScrollablePane, EditablePane, Pane,
|
|
|
|
ScrollingMixin, EditingMixin, object))
|
|
|
|
|
|
|
|
def test_mro_disagreement(self):
|
|
|
|
# Testing error messages for MRO disagreement...
|
2023-08-14 06:26:18 -03:00
|
|
|
mro_err_msg = ("Cannot create a consistent method resolution "
|
|
|
|
"order (MRO) for bases ")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def raises(exc, expected, callable, *args):
|
|
|
|
try:
|
|
|
|
callable(*args)
|
|
|
|
except exc as msg:
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# the exact msg is generally considered an impl detail
|
|
|
|
if support.check_impl_detail():
|
|
|
|
if not str(msg).startswith(expected):
|
|
|
|
self.fail("Message %r, expected %r" %
|
|
|
|
(str(msg), expected))
|
2008-02-05 14:13:15 -04:00
|
|
|
else:
|
|
|
|
self.fail("Expected %s" % exc)
|
|
|
|
|
|
|
|
class A(object): pass
|
|
|
|
class B(A): pass
|
|
|
|
class C(object): pass
|
|
|
|
|
|
|
|
# Test some very simple errors
|
|
|
|
raises(TypeError, "duplicate base class A",
|
|
|
|
type, "X", (A, A), {})
|
|
|
|
raises(TypeError, mro_err_msg,
|
|
|
|
type, "X", (A, B), {})
|
|
|
|
raises(TypeError, mro_err_msg,
|
|
|
|
type, "X", (A, C, B), {})
|
|
|
|
# Test a slightly more complex error
|
|
|
|
class GridLayout(object): pass
|
|
|
|
class HorizontalGrid(GridLayout): pass
|
|
|
|
class VerticalGrid(GridLayout): pass
|
|
|
|
class HVGrid(HorizontalGrid, VerticalGrid): pass
|
|
|
|
class VHGrid(VerticalGrid, HorizontalGrid): pass
|
|
|
|
raises(TypeError, mro_err_msg,
|
|
|
|
type, "ConfusedGrid", (HVGrid, VHGrid), {})
|
|
|
|
|
|
|
|
def test_object_class(self):
|
|
|
|
# Testing object class...
|
|
|
|
a = object()
|
|
|
|
self.assertEqual(a.__class__, object)
|
|
|
|
self.assertEqual(type(a), object)
|
|
|
|
b = object()
|
|
|
|
self.assertNotEqual(a, b)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "foo")
|
2008-02-05 14:13:15 -04:00
|
|
|
try:
|
|
|
|
a.foo = 12
|
|
|
|
except (AttributeError, TypeError):
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("object() should not allow setting a foo attribute")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(object(), "__dict__")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class Cdict(object):
|
|
|
|
pass
|
|
|
|
x = Cdict()
|
|
|
|
self.assertEqual(x.__dict__, {})
|
|
|
|
x.foo = 1
|
|
|
|
self.assertEqual(x.foo, 1)
|
|
|
|
self.assertEqual(x.__dict__, {'foo': 1})
|
|
|
|
|
2015-01-30 14:33:42 -04:00
|
|
|
def test_object_class_assignment_between_heaptypes_and_nonheaptypes(self):
|
|
|
|
class SubType(types.ModuleType):
|
|
|
|
a = 1
|
|
|
|
|
|
|
|
m = types.ModuleType("m")
|
|
|
|
self.assertTrue(m.__class__ is types.ModuleType)
|
|
|
|
self.assertFalse(hasattr(m, "a"))
|
|
|
|
|
|
|
|
m.__class__ = SubType
|
|
|
|
self.assertTrue(m.__class__ is SubType)
|
|
|
|
self.assertTrue(hasattr(m, "a"))
|
|
|
|
|
|
|
|
m.__class__ = types.ModuleType
|
|
|
|
self.assertTrue(m.__class__ is types.ModuleType)
|
|
|
|
self.assertFalse(hasattr(m, "a"))
|
|
|
|
|
2015-09-05 00:54:07 -03:00
|
|
|
# Make sure that builtin immutable objects don't support __class__
|
|
|
|
# assignment, because the object instances may be interned.
|
|
|
|
# We set __slots__ = () to ensure that the subclasses are
|
|
|
|
# memory-layout compatible, and thus otherwise reasonable candidates
|
|
|
|
# for __class__ assignment.
|
|
|
|
|
|
|
|
# The following types have immutable instances, but are not
|
|
|
|
# subclassable and thus don't need to be checked:
|
|
|
|
# NoneType, bool
|
|
|
|
|
|
|
|
class MyInt(int):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
(1).__class__ = MyInt
|
|
|
|
|
|
|
|
class MyFloat(float):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
(1.0).__class__ = MyFloat
|
|
|
|
|
|
|
|
class MyComplex(complex):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
(1 + 2j).__class__ = MyComplex
|
|
|
|
|
|
|
|
class MyStr(str):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
"a".__class__ = MyStr
|
|
|
|
|
|
|
|
class MyBytes(bytes):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
b"a".__class__ = MyBytes
|
|
|
|
|
|
|
|
class MyTuple(tuple):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
().__class__ = MyTuple
|
|
|
|
|
|
|
|
class MyFrozenSet(frozenset):
|
|
|
|
__slots__ = ()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
frozenset().__class__ = MyFrozenSet
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_slots(self):
|
|
|
|
# Testing __slots__...
|
|
|
|
class C0(object):
|
|
|
|
__slots__ = []
|
|
|
|
x = C0()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(x, "__dict__")
|
|
|
|
self.assertNotHasAttr(x, "foo")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class C1(object):
|
|
|
|
__slots__ = ['a']
|
|
|
|
x = C1()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(x, "__dict__")
|
|
|
|
self.assertNotHasAttr(x, "a")
|
2008-02-05 14:13:15 -04:00
|
|
|
x.a = 1
|
|
|
|
self.assertEqual(x.a, 1)
|
|
|
|
x.a = None
|
|
|
|
self.assertEqual(x.a, None)
|
|
|
|
del x.a
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(x, "a")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class C3(object):
|
|
|
|
__slots__ = ['a', 'b', 'c']
|
|
|
|
x = C3()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(x, "__dict__")
|
|
|
|
self.assertNotHasAttr(x, 'a')
|
|
|
|
self.assertNotHasAttr(x, 'b')
|
|
|
|
self.assertNotHasAttr(x, 'c')
|
2008-02-05 14:13:15 -04:00
|
|
|
x.a = 1
|
|
|
|
x.b = 2
|
|
|
|
x.c = 3
|
|
|
|
self.assertEqual(x.a, 1)
|
|
|
|
self.assertEqual(x.b, 2)
|
|
|
|
self.assertEqual(x.c, 3)
|
|
|
|
|
|
|
|
class C4(object):
|
|
|
|
"""Validate name mangling"""
|
|
|
|
__slots__ = ['__a']
|
|
|
|
def __init__(self, value):
|
|
|
|
self.__a = value
|
|
|
|
def get(self):
|
|
|
|
return self.__a
|
|
|
|
x = C4(5)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(x, '__dict__')
|
|
|
|
self.assertNotHasAttr(x, '__a')
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(x.get(), 5)
|
|
|
|
try:
|
|
|
|
x.__a = 6
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("Double underscored names not mangled")
|
|
|
|
|
|
|
|
# Make sure slot names are proper identifiers
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = [None]
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("[None] slots not caught")
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = ["foo bar"]
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("['foo bar'] slots not caught")
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = ["foo\0bar"]
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("['foo\\0bar'] slots not caught")
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = ["1"]
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("['1'] slots not caught")
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = [""]
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("[''] slots not caught")
|
|
|
|
class C(object):
|
|
|
|
__slots__ = ["a", "a_b", "_a", "A0123456789Z"]
|
|
|
|
# XXX(nnorwitz): was there supposed to be something tested
|
|
|
|
# from the class above?
|
|
|
|
|
|
|
|
# Test a single string is not expanded as a sequence.
|
|
|
|
class C(object):
|
|
|
|
__slots__ = "abc"
|
|
|
|
c = C()
|
|
|
|
c.abc = 5
|
|
|
|
self.assertEqual(c.abc, 5)
|
|
|
|
|
|
|
|
# Test unicode slot names
|
|
|
|
# Test a single unicode string is not expanded as a sequence.
|
|
|
|
class C(object):
|
|
|
|
__slots__ = "abc"
|
|
|
|
c = C()
|
|
|
|
c.abc = 5
|
|
|
|
self.assertEqual(c.abc, 5)
|
|
|
|
|
|
|
|
# _unicode_to_string used to modify slots in certain circumstances
|
|
|
|
slots = ("foo", "bar")
|
|
|
|
class C(object):
|
|
|
|
__slots__ = slots
|
|
|
|
x = C()
|
|
|
|
x.foo = 5
|
|
|
|
self.assertEqual(x.foo, 5)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(type(slots[0]), str)
|
2008-02-05 14:13:15 -04:00
|
|
|
# this used to leak references
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = [chr(128)]
|
|
|
|
except (TypeError, UnicodeEncodeError):
|
|
|
|
pass
|
|
|
|
else:
|
2014-06-20 16:16:35 -03:00
|
|
|
self.fail("[chr(128)] slots not caught")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
# Test leaks
|
|
|
|
class Counted(object):
|
|
|
|
counter = 0 # counts the number of instances alive
|
|
|
|
def __init__(self):
|
|
|
|
Counted.counter += 1
|
|
|
|
def __del__(self):
|
|
|
|
Counted.counter -= 1
|
|
|
|
class C(object):
|
|
|
|
__slots__ = ['a', 'b', 'c']
|
|
|
|
x = C()
|
|
|
|
x.a = Counted()
|
|
|
|
x.b = Counted()
|
|
|
|
x.c = Counted()
|
|
|
|
self.assertEqual(Counted.counter, 3)
|
|
|
|
del x
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(Counted.counter, 0)
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
x = D()
|
|
|
|
x.a = Counted()
|
|
|
|
x.z = Counted()
|
|
|
|
self.assertEqual(Counted.counter, 2)
|
|
|
|
del x
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(Counted.counter, 0)
|
|
|
|
class E(D):
|
|
|
|
__slots__ = ['e']
|
|
|
|
x = E()
|
|
|
|
x.a = Counted()
|
|
|
|
x.z = Counted()
|
|
|
|
x.e = Counted()
|
|
|
|
self.assertEqual(Counted.counter, 3)
|
|
|
|
del x
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(Counted.counter, 0)
|
|
|
|
|
|
|
|
# Test cyclical leaks [SF bug 519621]
|
|
|
|
class F(object):
|
|
|
|
__slots__ = ['a', 'b']
|
|
|
|
s = F()
|
|
|
|
s.a = [Counted(), s]
|
|
|
|
self.assertEqual(Counted.counter, 1)
|
|
|
|
s = None
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(Counted.counter, 0)
|
|
|
|
|
|
|
|
# Test lookup leaks [SF bug 572567]
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
if hasattr(gc, 'get_objects'):
|
|
|
|
class G(object):
|
2009-10-11 15:28:48 -03:00
|
|
|
def __eq__(self, other):
|
|
|
|
return False
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
g = G()
|
|
|
|
orig_objects = len(gc.get_objects())
|
|
|
|
for i in range(10):
|
|
|
|
g==g
|
|
|
|
new_objects = len(gc.get_objects())
|
|
|
|
self.assertEqual(orig_objects, new_objects)
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class H(object):
|
|
|
|
__slots__ = ['a', 'b']
|
|
|
|
def __init__(self):
|
|
|
|
self.a = 1
|
|
|
|
self.b = 2
|
|
|
|
def __del__(self_):
|
|
|
|
self.assertEqual(self_.a, 1)
|
|
|
|
self.assertEqual(self_.b, 2)
|
2008-11-03 17:29:09 -04:00
|
|
|
with support.captured_output('stderr') as s:
|
Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67028 | benjamin.peterson | 2008-10-25 18:27:07 -0500 (Sat, 25 Oct 2008) | 1 line
don't use a catch-all
........
r67040 | armin.rigo | 2008-10-28 12:01:21 -0500 (Tue, 28 Oct 2008) | 5 lines
Fix one of the tests: it relied on being present in an "output test" in
order to actually test what it was supposed to test, i.e. that the code
in the __del__ method did not crash. Use instead the new helper
test_support.captured_output().
........
r67044 | amaury.forgeotdarc | 2008-10-29 18:15:57 -0500 (Wed, 29 Oct 2008) | 3 lines
Correct error message in io.open():
closefd=True is the only accepted value with a file name.
........
r67046 | thomas.heller | 2008-10-30 15:18:13 -0500 (Thu, 30 Oct 2008) | 2 lines
Fixed a modulefinder crash on certain relative imports.
........
r67052 | christian.heimes | 2008-10-30 16:26:15 -0500 (Thu, 30 Oct 2008) | 1 line
Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members.
........
r67065 | benjamin.peterson | 2008-10-30 18:59:18 -0500 (Thu, 30 Oct 2008) | 1 line
move unprefixed error into .c file
........
r67070 | benjamin.peterson | 2008-10-31 15:41:44 -0500 (Fri, 31 Oct 2008) | 1 line
rephrase has_key doc
........
r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line
#4048 make the parser module accept relative imports as valid
........
r67082 | hirokazu.yamamoto | 2008-11-03 12:03:06 -0600 (Mon, 03 Nov 2008) | 2 lines
Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it. Written by Guilherme Polo (gpolo).
........
2008-11-03 16:31:38 -04:00
|
|
|
h = H()
|
2008-02-05 14:13:15 -04:00
|
|
|
del h
|
Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67028 | benjamin.peterson | 2008-10-25 18:27:07 -0500 (Sat, 25 Oct 2008) | 1 line
don't use a catch-all
........
r67040 | armin.rigo | 2008-10-28 12:01:21 -0500 (Tue, 28 Oct 2008) | 5 lines
Fix one of the tests: it relied on being present in an "output test" in
order to actually test what it was supposed to test, i.e. that the code
in the __del__ method did not crash. Use instead the new helper
test_support.captured_output().
........
r67044 | amaury.forgeotdarc | 2008-10-29 18:15:57 -0500 (Wed, 29 Oct 2008) | 3 lines
Correct error message in io.open():
closefd=True is the only accepted value with a file name.
........
r67046 | thomas.heller | 2008-10-30 15:18:13 -0500 (Thu, 30 Oct 2008) | 2 lines
Fixed a modulefinder crash on certain relative imports.
........
r67052 | christian.heimes | 2008-10-30 16:26:15 -0500 (Thu, 30 Oct 2008) | 1 line
Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members.
........
r67065 | benjamin.peterson | 2008-10-30 18:59:18 -0500 (Thu, 30 Oct 2008) | 1 line
move unprefixed error into .c file
........
r67070 | benjamin.peterson | 2008-10-31 15:41:44 -0500 (Fri, 31 Oct 2008) | 1 line
rephrase has_key doc
........
r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line
#4048 make the parser module accept relative imports as valid
........
r67082 | hirokazu.yamamoto | 2008-11-03 12:03:06 -0600 (Mon, 03 Nov 2008) | 2 lines
Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it. Written by Guilherme Polo (gpolo).
........
2008-11-03 16:31:38 -04:00
|
|
|
self.assertEqual(s.getvalue(), '')
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2009-12-30 15:44:54 -04:00
|
|
|
class X(object):
|
|
|
|
__slots__ = "a"
|
|
|
|
with self.assertRaises(AttributeError):
|
|
|
|
del X().a
|
|
|
|
|
2021-07-16 20:34:46 -03:00
|
|
|
# Inherit from object on purpose to check some backwards compatibility paths
|
|
|
|
class X(object):
|
|
|
|
__slots__ = "a"
|
|
|
|
with self.assertRaisesRegex(AttributeError, "'X' object has no attribute 'a'"):
|
|
|
|
X().a
|
|
|
|
|
2022-10-30 03:23:20 -03:00
|
|
|
# Test string subclass in `__slots__`, see gh-98783
|
|
|
|
class SubStr(str):
|
|
|
|
pass
|
|
|
|
class X(object):
|
|
|
|
__slots__ = (SubStr('x'),)
|
|
|
|
X().x = 1
|
|
|
|
with self.assertRaisesRegex(AttributeError, "'X' object has no attribute 'a'"):
|
|
|
|
X().a
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_slots_special(self):
|
|
|
|
# Testing __dict__ and __weakref__ in __slots__...
|
|
|
|
class D(object):
|
|
|
|
__slots__ = ["__dict__"]
|
|
|
|
a = D()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertHasAttr(a, "__dict__")
|
|
|
|
self.assertNotHasAttr(a, "__weakref__")
|
2008-02-05 14:13:15 -04:00
|
|
|
a.foo = 42
|
|
|
|
self.assertEqual(a.__dict__, {"foo": 42})
|
|
|
|
|
|
|
|
class W(object):
|
|
|
|
__slots__ = ["__weakref__"]
|
|
|
|
a = W()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertHasAttr(a, "__weakref__")
|
|
|
|
self.assertNotHasAttr(a, "__dict__")
|
2008-02-05 14:13:15 -04:00
|
|
|
try:
|
|
|
|
a.foo = 42
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't be allowed to set a.foo")
|
|
|
|
|
|
|
|
class C1(W, D):
|
|
|
|
__slots__ = []
|
|
|
|
a = C1()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertHasAttr(a, "__dict__")
|
|
|
|
self.assertHasAttr(a, "__weakref__")
|
2008-02-05 14:13:15 -04:00
|
|
|
a.foo = 42
|
|
|
|
self.assertEqual(a.__dict__, {"foo": 42})
|
|
|
|
|
|
|
|
class C2(D, W):
|
|
|
|
__slots__ = []
|
|
|
|
a = C2()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertHasAttr(a, "__dict__")
|
|
|
|
self.assertHasAttr(a, "__weakref__")
|
2008-02-05 14:13:15 -04:00
|
|
|
a.foo = 42
|
|
|
|
self.assertEqual(a.__dict__, {"foo": 42})
|
|
|
|
|
2017-03-07 23:18:49 -04:00
|
|
|
def test_slots_special2(self):
|
|
|
|
# Testing __qualname__ and __classcell__ in __slots__
|
|
|
|
class Meta(type):
|
|
|
|
def __new__(cls, name, bases, namespace, attr):
|
|
|
|
self.assertIn(attr, namespace)
|
|
|
|
return super().__new__(cls, name, bases, namespace)
|
|
|
|
|
|
|
|
class C1:
|
|
|
|
def __init__(self):
|
|
|
|
self.b = 42
|
|
|
|
class C2(C1, metaclass=Meta, attr="__classcell__"):
|
|
|
|
__slots__ = ["__classcell__"]
|
|
|
|
def __init__(self):
|
|
|
|
super().__init__()
|
|
|
|
self.assertIsInstance(C2.__dict__["__classcell__"],
|
|
|
|
types.MemberDescriptorType)
|
|
|
|
c = C2()
|
|
|
|
self.assertEqual(c.b, 42)
|
|
|
|
self.assertNotHasAttr(c, "__classcell__")
|
|
|
|
c.__classcell__ = 42
|
|
|
|
self.assertEqual(c.__classcell__, 42)
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class C3:
|
|
|
|
__classcell__ = 42
|
|
|
|
__slots__ = ["__classcell__"]
|
|
|
|
|
|
|
|
class Q1(metaclass=Meta, attr="__qualname__"):
|
|
|
|
__slots__ = ["__qualname__"]
|
|
|
|
self.assertEqual(Q1.__qualname__, C1.__qualname__[:-2] + "Q1")
|
|
|
|
self.assertIsInstance(Q1.__dict__["__qualname__"],
|
|
|
|
types.MemberDescriptorType)
|
|
|
|
q = Q1()
|
|
|
|
self.assertNotHasAttr(q, "__qualname__")
|
|
|
|
q.__qualname__ = "q"
|
|
|
|
self.assertEqual(q.__qualname__, "q")
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class Q2:
|
|
|
|
__qualname__ = object()
|
|
|
|
__slots__ = ["__qualname__"]
|
|
|
|
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines
Add diagnostic message to help figure-out why SocketServer tests occasionally crash
when trying to remove a pid that in not in the activechildren list.
........
r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line
Add fixed-point examples to the decimal FAQ
........
r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line
Improve rst markup
........
r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line
Show how to remove exponents.
........
r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup.
........
r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
........
r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line
Simplify moneyfmt() recipe.
........
r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup
........
r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line
No need to register subclass of ABCs.
........
r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line
Try to correct a markup error that does hide the following paragraph.
........
r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line
Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115
........
r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line
Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them.
........
r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines
Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ
Thanks to Thomas Herve for the fix.
........
r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line
In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
........
r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines
Two new functions:
* place_summary_first copies the regrtest summary to the front of the file
making it easier to scan quickly for problems.
* count_failures gets the actual count of the number of failing tests, not
just a 1 (some failures) or 0 (no failures).
........
r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line
Update example to match the current syntax.
........
r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines
Issue #2115: __slot__ attributes setting was 10x slower.
Also correct a possible crash using ABCs.
This change is exactly the same as an optimisation
done 5 years ago, but on slot *access*:
http://svn.python.org/view?view=rev&rev=28297
........
r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines
Temporarily let these tests pass
........
r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
........
r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines
Configured selection highlighting colors were ignored; updating highlighting
in the config dialog would cause non-Python files to be colored as if they
were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat.
........
r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines
Re-enable tests, they were failing since gc.collect() clears the various freelists.
They still remain fragile.
For example, a call to assertEqual currently does not make any allocation
(which surprised me at first).
But this can change when gc.collect also deletes the numerous "zombie frames"
attached to each function.
........
2008-02-16 03:38:31 -04:00
|
|
|
def test_slots_descriptor(self):
|
|
|
|
# Issue2115: slot descriptors did not correctly check
|
|
|
|
# the type of the given object
|
|
|
|
import abc
|
|
|
|
class MyABC(metaclass=abc.ABCMeta):
|
|
|
|
__slots__ = "a"
|
|
|
|
|
|
|
|
class Unrelated(object):
|
|
|
|
pass
|
|
|
|
MyABC.register(Unrelated)
|
|
|
|
|
|
|
|
u = Unrelated()
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(u, MyABC)
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines
Add diagnostic message to help figure-out why SocketServer tests occasionally crash
when trying to remove a pid that in not in the activechildren list.
........
r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line
Add fixed-point examples to the decimal FAQ
........
r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line
Improve rst markup
........
r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line
Show how to remove exponents.
........
r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup.
........
r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line
Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation.
........
r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line
Simplify moneyfmt() recipe.
........
r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line
Fix markup
........
r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line
No need to register subclass of ABCs.
........
r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line
Try to correct a markup error that does hide the following paragraph.
........
r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line
Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115
........
r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line
Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them.
........
r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines
Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ
Thanks to Thomas Herve for the fix.
........
r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line
In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
........
r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines
Two new functions:
* place_summary_first copies the regrtest summary to the front of the file
making it easier to scan quickly for problems.
* count_failures gets the actual count of the number of failing tests, not
just a 1 (some failures) or 0 (no failures).
........
r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line
Update example to match the current syntax.
........
r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines
Issue #2115: __slot__ attributes setting was 10x slower.
Also correct a possible crash using ABCs.
This change is exactly the same as an optimisation
done 5 years ago, but on slot *access*:
http://svn.python.org/view?view=rev&rev=28297
........
r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines
Temporarily let these tests pass
........
r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
........
r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines
Configured selection highlighting colors were ignored; updating highlighting
in the config dialog would cause non-Python files to be colored as if they
were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat.
........
r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines
Re-enable tests, they were failing since gc.collect() clears the various freelists.
They still remain fragile.
For example, a call to assertEqual currently does not make any allocation
(which surprised me at first).
But this can change when gc.collect also deletes the numerous "zombie frames"
attached to each function.
........
2008-02-16 03:38:31 -04:00
|
|
|
|
|
|
|
# This used to crash
|
|
|
|
self.assertRaises(TypeError, MyABC.a.__set__, u, 3)
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_dynamics(self):
|
|
|
|
# Testing class attribute propagation...
|
|
|
|
class D(object):
|
|
|
|
pass
|
|
|
|
class E(D):
|
|
|
|
pass
|
|
|
|
class F(D):
|
|
|
|
pass
|
|
|
|
D.foo = 1
|
|
|
|
self.assertEqual(D.foo, 1)
|
|
|
|
# Test that dynamic attributes are inherited
|
|
|
|
self.assertEqual(E.foo, 1)
|
|
|
|
self.assertEqual(F.foo, 1)
|
|
|
|
# Test dynamic instances
|
|
|
|
class C(object):
|
|
|
|
pass
|
|
|
|
a = C()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "foobar")
|
2008-02-05 14:13:15 -04:00
|
|
|
C.foobar = 2
|
|
|
|
self.assertEqual(a.foobar, 2)
|
|
|
|
C.method = lambda self: 42
|
|
|
|
self.assertEqual(a.method(), 42)
|
|
|
|
C.__repr__ = lambda self: "C()"
|
|
|
|
self.assertEqual(repr(a), "C()")
|
|
|
|
C.__int__ = lambda self: 100
|
|
|
|
self.assertEqual(int(a), 100)
|
|
|
|
self.assertEqual(a.foobar, 2)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "spam")
|
2008-02-05 14:13:15 -04:00
|
|
|
def mygetattr(self, name):
|
|
|
|
if name == "spam":
|
|
|
|
return "spam"
|
|
|
|
raise AttributeError
|
|
|
|
C.__getattr__ = mygetattr
|
|
|
|
self.assertEqual(a.spam, "spam")
|
|
|
|
a.new = 12
|
|
|
|
self.assertEqual(a.new, 12)
|
|
|
|
def mysetattr(self, name, value):
|
|
|
|
if name == "spam":
|
|
|
|
raise AttributeError
|
|
|
|
return object.__setattr__(self, name, value)
|
|
|
|
C.__setattr__ = mysetattr
|
2022-01-08 04:14:40 -04:00
|
|
|
with self.assertRaises(AttributeError):
|
2008-02-05 14:13:15 -04:00
|
|
|
a.spam = "not spam"
|
2022-01-08 04:14:40 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(a.spam, "spam")
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
d.foo = 1
|
|
|
|
self.assertEqual(d.foo, 1)
|
|
|
|
|
|
|
|
# Test handling of int*seq and seq*int
|
|
|
|
class I(int):
|
|
|
|
pass
|
|
|
|
self.assertEqual("a"*I(2), "aa")
|
|
|
|
self.assertEqual(I(2)*"a", "aa")
|
|
|
|
self.assertEqual(2*I(3), 6)
|
|
|
|
self.assertEqual(I(3)*2, 6)
|
|
|
|
self.assertEqual(I(3)*I(2), 6)
|
|
|
|
|
|
|
|
# Test comparison of classes with dynamic metaclasses
|
|
|
|
class dynamicmetaclass(type):
|
|
|
|
pass
|
|
|
|
class someclass(metaclass=dynamicmetaclass):
|
|
|
|
pass
|
|
|
|
self.assertNotEqual(someclass, object)
|
|
|
|
|
|
|
|
def test_errors(self):
|
|
|
|
# Testing errors...
|
|
|
|
try:
|
|
|
|
class C(list, dict):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("inheritance from both list and dict should be illegal")
|
|
|
|
|
|
|
|
try:
|
|
|
|
class C(object, None):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("inheritance from non-type should be illegal")
|
|
|
|
class Classic:
|
|
|
|
pass
|
|
|
|
|
|
|
|
try:
|
|
|
|
class C(type(len)):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("inheritance from CFunction should be illegal")
|
|
|
|
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = 1
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("__slots__ = 1 should be illegal")
|
|
|
|
|
|
|
|
try:
|
|
|
|
class C(object):
|
|
|
|
__slots__ = [1]
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("__slots__ = [1] should be illegal")
|
|
|
|
|
|
|
|
class M1(type):
|
|
|
|
pass
|
|
|
|
class M2(type):
|
|
|
|
pass
|
|
|
|
class A1(object, metaclass=M1):
|
|
|
|
pass
|
|
|
|
class A2(object, metaclass=M2):
|
|
|
|
pass
|
|
|
|
try:
|
|
|
|
class B(A1, A2):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("finding the most derived metaclass should have failed")
|
|
|
|
|
|
|
|
def test_classmethods(self):
|
|
|
|
# Testing class methods...
|
|
|
|
class C(object):
|
|
|
|
def foo(*a): return a
|
|
|
|
goo = classmethod(foo)
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(C.goo(1), (C, 1))
|
|
|
|
self.assertEqual(c.goo(1), (C, 1))
|
|
|
|
self.assertEqual(c.foo(1), (c, 1))
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
self.assertEqual(D.goo(1), (D, 1))
|
|
|
|
self.assertEqual(d.goo(1), (D, 1))
|
|
|
|
self.assertEqual(d.foo(1), (d, 1))
|
|
|
|
self.assertEqual(D.foo(d, 1), (d, 1))
|
|
|
|
# Test for a specific crash (SF bug 528132)
|
2021-04-09 12:51:22 -03:00
|
|
|
def f(cls, arg):
|
|
|
|
"f docstring"
|
|
|
|
return (cls, arg)
|
2008-02-05 14:13:15 -04:00
|
|
|
ff = classmethod(f)
|
|
|
|
self.assertEqual(ff.__get__(0, int)(42), (int, 42))
|
|
|
|
self.assertEqual(ff.__get__(0)(42), (int, 42))
|
|
|
|
|
|
|
|
# Test super() with classmethods (SF bug 535444)
|
|
|
|
self.assertEqual(C.goo.__self__, C)
|
|
|
|
self.assertEqual(D.goo.__self__, D)
|
|
|
|
self.assertEqual(super(D,D).goo.__self__, D)
|
|
|
|
self.assertEqual(super(D,d).goo.__self__, D)
|
|
|
|
self.assertEqual(super(D,D).goo(), (D,))
|
|
|
|
self.assertEqual(super(D,d).goo(), (D,))
|
|
|
|
|
Merged revisions 74277,74321,74323,74326,74355,74465,74467,74488,74492,74513,74531,74549,74553,74625,74632,74643-74644,74647,74652,74666,74671,74727,74739 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74277 | sean.reifschneider | 2009-08-01 18:54:55 -0500 (Sat, 01 Aug 2009) | 3 lines
- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
NUL: Bogus TypeError detail string.
........
r74321 | guilherme.polo | 2009-08-05 11:51:41 -0500 (Wed, 05 Aug 2009) | 1 line
Easier reference to find (at least while svn continues being used).
........
r74323 | guilherme.polo | 2009-08-05 18:48:26 -0500 (Wed, 05 Aug 2009) | 1 line
Typo.
........
r74326 | jesse.noller | 2009-08-05 21:05:56 -0500 (Wed, 05 Aug 2009) | 1 line
Fix issue 4660: spurious task_done errors in multiprocessing, remove doc note for from_address
........
r74355 | gregory.p.smith | 2009-08-12 12:02:37 -0500 (Wed, 12 Aug 2009) | 2 lines
comment typo fix
........
r74465 | vinay.sajip | 2009-08-15 18:23:12 -0500 (Sat, 15 Aug 2009) | 1 line
Added section on logging to one file from multiple processes.
........
r74467 | vinay.sajip | 2009-08-15 18:34:47 -0500 (Sat, 15 Aug 2009) | 1 line
Refined section on logging to one file from multiple processes.
........
r74488 | vinay.sajip | 2009-08-17 08:14:37 -0500 (Mon, 17 Aug 2009) | 1 line
Further refined section on logging to one file from multiple processes.
........
r74492 | r.david.murray | 2009-08-17 14:26:49 -0500 (Mon, 17 Aug 2009) | 2 lines
Issue 6685: 'toupper' -> 'upper' in cgi doc example explanation.
........
r74513 | skip.montanaro | 2009-08-18 09:37:52 -0500 (Tue, 18 Aug 2009) | 1 line
missing module ref (issue6723)
........
r74531 | vinay.sajip | 2009-08-20 17:04:32 -0500 (Thu, 20 Aug 2009) | 1 line
Added section on exceptions raised during logging.
........
r74549 | benjamin.peterson | 2009-08-24 12:42:36 -0500 (Mon, 24 Aug 2009) | 1 line
fix pdf building by teaching latex the right encoding package
........
r74553 | r.david.murray | 2009-08-26 20:04:59 -0500 (Wed, 26 Aug 2009) | 2 lines
Remove leftover text from end of sentence.
........
r74625 | benjamin.peterson | 2009-09-01 17:27:57 -0500 (Tue, 01 Sep 2009) | 1 line
remove the check that classmethod's argument is a callable
........
r74632 | georg.brandl | 2009-09-03 02:27:26 -0500 (Thu, 03 Sep 2009) | 1 line
#6828: fix wrongly highlighted blocks.
........
r74643 | georg.brandl | 2009-09-04 01:59:20 -0500 (Fri, 04 Sep 2009) | 2 lines
Issue #2666: Handle BROWSER environment variable properly for unknown browser names in the webbrowser module.
........
r74644 | georg.brandl | 2009-09-04 02:55:14 -0500 (Fri, 04 Sep 2009) | 1 line
#5047: remove Monterey support from configure.
........
r74647 | georg.brandl | 2009-09-04 03:17:04 -0500 (Fri, 04 Sep 2009) | 2 lines
Issue #5275: In Cookie's Cookie.load(), properly handle non-string arguments as documented.
........
r74652 | georg.brandl | 2009-09-04 06:25:37 -0500 (Fri, 04 Sep 2009) | 1 line
#6756: add some info about the "acct" parameter.
........
r74666 | georg.brandl | 2009-09-05 04:04:09 -0500 (Sat, 05 Sep 2009) | 1 line
#6841: remove duplicated word.
........
r74671 | georg.brandl | 2009-09-05 11:47:17 -0500 (Sat, 05 Sep 2009) | 1 line
#6843: add link from filterwarnings to where the meaning of the arguments is covered.
........
r74727 | benjamin.peterson | 2009-09-08 18:04:22 -0500 (Tue, 08 Sep 2009) | 1 line
#6865 fix ref counting in initialization of pwd module
........
r74739 | georg.brandl | 2009-09-11 02:55:20 -0500 (Fri, 11 Sep 2009) | 1 line
Move function back to its section.
........
2009-09-11 19:24:02 -03:00
|
|
|
# Verify that a non-callable will raise
|
|
|
|
meth = classmethod(1).__get__(1)
|
|
|
|
self.assertRaises(TypeError, meth)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
# Verify that classmethod() doesn't allow keyword args
|
|
|
|
try:
|
|
|
|
classmethod(f, kw=1)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("classmethod shouldn't accept keyword args")
|
|
|
|
|
2012-02-19 02:10:25 -04:00
|
|
|
cm = classmethod(f)
|
2021-04-09 12:51:22 -03:00
|
|
|
cm_dict = {'__annotations__': {},
|
|
|
|
'__doc__': "f docstring",
|
|
|
|
'__module__': __name__,
|
|
|
|
'__name__': 'f',
|
|
|
|
'__qualname__': f.__qualname__}
|
|
|
|
self.assertEqual(cm.__dict__, cm_dict)
|
|
|
|
|
2012-02-19 02:10:25 -04:00
|
|
|
cm.x = 42
|
|
|
|
self.assertEqual(cm.x, 42)
|
2021-04-09 12:51:22 -03:00
|
|
|
self.assertEqual(cm.__dict__, {"x" : 42, **cm_dict})
|
2012-02-19 02:10:25 -04:00
|
|
|
del cm.x
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(cm, "x")
|
2012-02-19 02:10:25 -04:00
|
|
|
|
2018-02-13 06:28:33 -04:00
|
|
|
@support.refcount_test
|
|
|
|
def test_refleaks_in_classmethod___init__(self):
|
|
|
|
gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
|
|
|
|
cm = classmethod(None)
|
|
|
|
refs_before = gettotalrefcount()
|
|
|
|
for i in range(100):
|
|
|
|
cm.__init__(None)
|
|
|
|
self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
@support.impl_detail("the module 'xxsubtype' is internal")
|
2022-07-14 04:51:49 -03:00
|
|
|
@unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_classmethods_in_c(self):
|
|
|
|
# Testing C-based class methods...
|
|
|
|
import xxsubtype as spam
|
|
|
|
a = (1, 2, 3)
|
|
|
|
d = {'abc': 123}
|
|
|
|
x, a1, d1 = spam.spamlist.classmeth(*a, **d)
|
|
|
|
self.assertEqual(x, spam.spamlist)
|
|
|
|
self.assertEqual(a, a1)
|
|
|
|
self.assertEqual(d, d1)
|
|
|
|
x, a1, d1 = spam.spamlist().classmeth(*a, **d)
|
|
|
|
self.assertEqual(x, spam.spamlist)
|
|
|
|
self.assertEqual(a, a1)
|
|
|
|
self.assertEqual(d, d1)
|
2012-05-01 10:51:09 -03:00
|
|
|
spam_cm = spam.spamlist.__dict__['classmeth']
|
|
|
|
x2, a2, d2 = spam_cm(spam.spamlist, *a, **d)
|
|
|
|
self.assertEqual(x2, spam.spamlist)
|
|
|
|
self.assertEqual(a2, a1)
|
|
|
|
self.assertEqual(d2, d1)
|
|
|
|
class SubSpam(spam.spamlist): pass
|
|
|
|
x2, a2, d2 = spam_cm(SubSpam, *a, **d)
|
|
|
|
self.assertEqual(x2, SubSpam)
|
|
|
|
self.assertEqual(a2, a1)
|
|
|
|
self.assertEqual(d2, d1)
|
2019-03-26 06:26:33 -03:00
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
2012-05-01 10:51:09 -03:00
|
|
|
spam_cm()
|
2019-03-26 06:26:33 -03:00
|
|
|
self.assertEqual(
|
|
|
|
str(cm.exception),
|
|
|
|
"descriptor 'classmeth' of 'xxsubtype.spamlist' "
|
|
|
|
"object needs an argument")
|
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
2012-05-01 10:51:09 -03:00
|
|
|
spam_cm(spam.spamlist())
|
2019-03-26 06:26:33 -03:00
|
|
|
self.assertEqual(
|
|
|
|
str(cm.exception),
|
2019-06-07 07:20:24 -03:00
|
|
|
"descriptor 'classmeth' for type 'xxsubtype.spamlist' "
|
|
|
|
"needs a type, not a 'xxsubtype.spamlist' as arg 2")
|
2019-03-26 06:26:33 -03:00
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
2012-05-01 10:51:09 -03:00
|
|
|
spam_cm(list)
|
2019-04-01 05:56:11 -03:00
|
|
|
expected_errmsg = (
|
2019-03-26 06:26:33 -03:00
|
|
|
"descriptor 'classmeth' requires a subtype of 'xxsubtype.spamlist' "
|
|
|
|
"but received 'list'")
|
2019-04-01 05:56:11 -03:00
|
|
|
self.assertEqual(str(cm.exception), expected_errmsg)
|
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
spam_cm.__get__(None, list)
|
|
|
|
self.assertEqual(str(cm.exception), expected_errmsg)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_staticmethods(self):
|
|
|
|
# Testing static methods...
|
|
|
|
class C(object):
|
|
|
|
def foo(*a): return a
|
|
|
|
goo = staticmethod(foo)
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(C.goo(1), (1,))
|
|
|
|
self.assertEqual(c.goo(1), (1,))
|
|
|
|
self.assertEqual(c.foo(1), (c, 1,))
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
self.assertEqual(D.goo(1), (1,))
|
|
|
|
self.assertEqual(d.goo(1), (1,))
|
|
|
|
self.assertEqual(d.foo(1), (d, 1))
|
|
|
|
self.assertEqual(D.foo(d, 1), (d, 1))
|
2012-02-19 02:10:25 -04:00
|
|
|
sm = staticmethod(None)
|
2021-04-09 12:51:22 -03:00
|
|
|
self.assertEqual(sm.__dict__, {'__doc__': None})
|
2012-02-19 02:10:25 -04:00
|
|
|
sm.x = 42
|
|
|
|
self.assertEqual(sm.x, 42)
|
2021-04-09 12:51:22 -03:00
|
|
|
self.assertEqual(sm.__dict__, {"x" : 42, '__doc__': None})
|
2012-02-19 02:10:25 -04:00
|
|
|
del sm.x
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(sm, "x")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2018-02-13 06:28:33 -04:00
|
|
|
@support.refcount_test
|
|
|
|
def test_refleaks_in_staticmethod___init__(self):
|
|
|
|
gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount')
|
|
|
|
sm = staticmethod(None)
|
|
|
|
refs_before = gettotalrefcount()
|
|
|
|
for i in range(100):
|
|
|
|
sm.__init__(None)
|
|
|
|
self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
@support.impl_detail("the module 'xxsubtype' is internal")
|
2022-07-14 04:51:49 -03:00
|
|
|
@unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_staticmethods_in_c(self):
|
|
|
|
# Testing C-based static methods...
|
|
|
|
import xxsubtype as spam
|
|
|
|
a = (1, 2, 3)
|
|
|
|
d = {"abc": 123}
|
|
|
|
x, a1, d1 = spam.spamlist.staticmeth(*a, **d)
|
|
|
|
self.assertEqual(x, None)
|
|
|
|
self.assertEqual(a, a1)
|
|
|
|
self.assertEqual(d, d1)
|
|
|
|
x, a1, d2 = spam.spamlist().staticmeth(*a, **d)
|
|
|
|
self.assertEqual(x, None)
|
|
|
|
self.assertEqual(a, a1)
|
|
|
|
self.assertEqual(d, d1)
|
|
|
|
|
|
|
|
def test_classic(self):
|
|
|
|
# Testing classic classes...
|
|
|
|
class C:
|
|
|
|
def foo(*a): return a
|
|
|
|
goo = classmethod(foo)
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(C.goo(1), (C, 1))
|
|
|
|
self.assertEqual(c.goo(1), (C, 1))
|
|
|
|
self.assertEqual(c.foo(1), (c, 1))
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
self.assertEqual(D.goo(1), (D, 1))
|
|
|
|
self.assertEqual(d.goo(1), (D, 1))
|
|
|
|
self.assertEqual(d.foo(1), (d, 1))
|
|
|
|
self.assertEqual(D.foo(d, 1), (d, 1))
|
|
|
|
class E: # *not* subclassing from C
|
|
|
|
foo = C.foo
|
|
|
|
self.assertEqual(E().foo.__func__, C.foo) # i.e., unbound
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(repr(C.foo.__get__(C())).startswith("<bound method "))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_compattr(self):
|
|
|
|
# Testing computed attributes...
|
|
|
|
class C(object):
|
|
|
|
class computed_attribute(object):
|
|
|
|
def __init__(self, get, set=None, delete=None):
|
|
|
|
self.__get = get
|
|
|
|
self.__set = set
|
|
|
|
self.__delete = delete
|
|
|
|
def __get__(self, obj, type=None):
|
|
|
|
return self.__get(obj)
|
|
|
|
def __set__(self, obj, value):
|
|
|
|
return self.__set(obj, value)
|
|
|
|
def __delete__(self, obj):
|
|
|
|
return self.__delete(obj)
|
|
|
|
def __init__(self):
|
|
|
|
self.__x = 0
|
|
|
|
def __get_x(self):
|
|
|
|
x = self.__x
|
|
|
|
self.__x = x+1
|
|
|
|
return x
|
|
|
|
def __set_x(self, x):
|
|
|
|
self.__x = x
|
|
|
|
def __delete_x(self):
|
|
|
|
del self.__x
|
|
|
|
x = computed_attribute(__get_x, __set_x, __delete_x)
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a.x, 0)
|
|
|
|
self.assertEqual(a.x, 1)
|
|
|
|
a.x = 10
|
|
|
|
self.assertEqual(a.x, 10)
|
|
|
|
self.assertEqual(a.x, 11)
|
|
|
|
del a.x
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, 'x')
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_newslots(self):
|
|
|
|
# Testing __new__ slot override...
|
|
|
|
class C(list):
|
|
|
|
def __new__(cls):
|
|
|
|
self = list.__new__(cls)
|
|
|
|
self.foo = 1
|
|
|
|
return self
|
|
|
|
def __init__(self):
|
|
|
|
self.foo = self.foo + 2
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a.foo, 3)
|
|
|
|
self.assertEqual(a.__class__, C)
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
b = D()
|
|
|
|
self.assertEqual(b.foo, 3)
|
|
|
|
self.assertEqual(b.__class__, D)
|
|
|
|
|
2016-12-14 13:52:17 -04:00
|
|
|
@unittest.expectedFailure
|
2016-12-02 02:42:43 -04:00
|
|
|
def test_bad_new(self):
|
|
|
|
self.assertRaises(TypeError, object.__new__)
|
|
|
|
self.assertRaises(TypeError, object.__new__, '')
|
|
|
|
self.assertRaises(TypeError, list.__new__, object)
|
|
|
|
self.assertRaises(TypeError, object.__new__, list)
|
|
|
|
class C(object):
|
|
|
|
__new__ = list.__new__
|
|
|
|
self.assertRaises(TypeError, C)
|
|
|
|
class C(list):
|
|
|
|
__new__ = object.__new__
|
|
|
|
self.assertRaises(TypeError, C)
|
|
|
|
|
|
|
|
def test_object_new(self):
|
|
|
|
class A(object):
|
|
|
|
pass
|
|
|
|
object.__new__(A)
|
|
|
|
self.assertRaises(TypeError, object.__new__, A, 5)
|
|
|
|
object.__init__(A())
|
|
|
|
self.assertRaises(TypeError, object.__init__, A(), 5)
|
|
|
|
|
|
|
|
class A(object):
|
|
|
|
def __init__(self, foo):
|
|
|
|
self.foo = foo
|
|
|
|
object.__new__(A)
|
|
|
|
object.__new__(A, 5)
|
|
|
|
object.__init__(A(3))
|
|
|
|
self.assertRaises(TypeError, object.__init__, A(3), 5)
|
|
|
|
|
|
|
|
class A(object):
|
|
|
|
def __new__(cls, foo):
|
|
|
|
return object.__new__(cls)
|
|
|
|
object.__new__(A)
|
|
|
|
self.assertRaises(TypeError, object.__new__, A, 5)
|
|
|
|
object.__init__(A(3))
|
|
|
|
object.__init__(A(3), 5)
|
|
|
|
|
|
|
|
class A(object):
|
|
|
|
def __new__(cls, foo):
|
|
|
|
return object.__new__(cls)
|
|
|
|
def __init__(self, foo):
|
|
|
|
self.foo = foo
|
|
|
|
object.__new__(A)
|
|
|
|
self.assertRaises(TypeError, object.__new__, A, 5)
|
|
|
|
object.__init__(A(3))
|
|
|
|
self.assertRaises(TypeError, object.__init__, A(3), 5)
|
|
|
|
|
2016-12-14 13:52:17 -04:00
|
|
|
@unittest.expectedFailure
|
2016-12-02 02:42:43 -04:00
|
|
|
def test_restored_object_new(self):
|
|
|
|
class A(object):
|
|
|
|
def __new__(cls, *args, **kwargs):
|
|
|
|
raise AssertionError
|
|
|
|
self.assertRaises(AssertionError, A)
|
|
|
|
class B(A):
|
|
|
|
__new__ = object.__new__
|
|
|
|
def __init__(self, foo):
|
|
|
|
self.foo = foo
|
|
|
|
with warnings.catch_warnings():
|
|
|
|
warnings.simplefilter('error', DeprecationWarning)
|
|
|
|
b = B(3)
|
|
|
|
self.assertEqual(b.foo, 3)
|
|
|
|
self.assertEqual(b.__class__, B)
|
|
|
|
del B.__new__
|
|
|
|
self.assertRaises(AssertionError, B)
|
|
|
|
del A.__new__
|
|
|
|
with warnings.catch_warnings():
|
|
|
|
warnings.simplefilter('error', DeprecationWarning)
|
|
|
|
b = B(3)
|
|
|
|
self.assertEqual(b.foo, 3)
|
|
|
|
self.assertEqual(b.__class__, B)
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_altmro(self):
|
|
|
|
# Testing mro() and overriding it...
|
|
|
|
class A(object):
|
|
|
|
def f(self): return "A"
|
|
|
|
class B(A):
|
|
|
|
pass
|
|
|
|
class C(A):
|
|
|
|
def f(self): return "C"
|
|
|
|
class D(B, C):
|
|
|
|
pass
|
2017-12-20 10:58:21 -04:00
|
|
|
self.assertEqual(A.mro(), [A, object])
|
|
|
|
self.assertEqual(A.__mro__, (A, object))
|
|
|
|
self.assertEqual(B.mro(), [B, A, object])
|
|
|
|
self.assertEqual(B.__mro__, (B, A, object))
|
|
|
|
self.assertEqual(C.mro(), [C, A, object])
|
|
|
|
self.assertEqual(C.__mro__, (C, A, object))
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(D.mro(), [D, B, C, A, object])
|
|
|
|
self.assertEqual(D.__mro__, (D, B, C, A, object))
|
|
|
|
self.assertEqual(D().f(), "C")
|
|
|
|
|
|
|
|
class PerverseMetaType(type):
|
|
|
|
def mro(cls):
|
|
|
|
L = type.mro(cls)
|
|
|
|
L.reverse()
|
|
|
|
return L
|
|
|
|
class X(D,B,C,A, metaclass=PerverseMetaType):
|
|
|
|
pass
|
|
|
|
self.assertEqual(X.__mro__, (object, A, C, B, D, X))
|
|
|
|
self.assertEqual(X().f(), "A")
|
|
|
|
|
|
|
|
try:
|
|
|
|
class _metaclass(type):
|
|
|
|
def mro(self):
|
|
|
|
return [self, dict, object]
|
|
|
|
class X(object, metaclass=_metaclass):
|
|
|
|
pass
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# In CPython, the class creation above already raises
|
|
|
|
# TypeError, as a protection against the fact that
|
|
|
|
# instances of X would segfault it. In other Python
|
|
|
|
# implementations it would be ok to let the class X
|
|
|
|
# be created, but instead get a clean TypeError on the
|
|
|
|
# __setitem__ below.
|
|
|
|
x = object.__new__(X)
|
|
|
|
x[5] = 6
|
2008-02-05 14:13:15 -04:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("devious mro() return not caught")
|
|
|
|
|
|
|
|
try:
|
|
|
|
class _metaclass(type):
|
|
|
|
def mro(self):
|
|
|
|
return [1]
|
|
|
|
class X(object, metaclass=_metaclass):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("non-class mro() return not caught")
|
|
|
|
|
|
|
|
try:
|
|
|
|
class _metaclass(type):
|
|
|
|
def mro(self):
|
|
|
|
return 1
|
|
|
|
class X(object, metaclass=_metaclass):
|
|
|
|
pass
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("non-sequence mro() return not caught")
|
|
|
|
|
|
|
|
def test_overloading(self):
|
|
|
|
# Testing operator overloading...
|
|
|
|
|
|
|
|
class B(object):
|
|
|
|
"Intermediate class because object doesn't have a __setattr__"
|
|
|
|
|
|
|
|
class C(B):
|
|
|
|
def __getattr__(self, name):
|
|
|
|
if name == "foo":
|
|
|
|
return ("getattr", name)
|
|
|
|
else:
|
|
|
|
raise AttributeError
|
|
|
|
def __setattr__(self, name, value):
|
|
|
|
if name == "foo":
|
|
|
|
self.setattr = (name, value)
|
|
|
|
else:
|
|
|
|
return B.__setattr__(self, name, value)
|
|
|
|
def __delattr__(self, name):
|
|
|
|
if name == "foo":
|
|
|
|
self.delattr = name
|
|
|
|
else:
|
|
|
|
return B.__delattr__(self, name)
|
|
|
|
|
|
|
|
def __getitem__(self, key):
|
|
|
|
return ("getitem", key)
|
|
|
|
def __setitem__(self, key, value):
|
|
|
|
self.setitem = (key, value)
|
|
|
|
def __delitem__(self, key):
|
|
|
|
self.delitem = key
|
|
|
|
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a.foo, ("getattr", "foo"))
|
|
|
|
a.foo = 12
|
|
|
|
self.assertEqual(a.setattr, ("foo", 12))
|
|
|
|
del a.foo
|
|
|
|
self.assertEqual(a.delattr, "foo")
|
|
|
|
|
|
|
|
self.assertEqual(a[12], ("getitem", 12))
|
|
|
|
a[12] = 21
|
|
|
|
self.assertEqual(a.setitem, (12, 21))
|
|
|
|
del a[12]
|
|
|
|
self.assertEqual(a.delitem, 12)
|
|
|
|
|
|
|
|
self.assertEqual(a[0:10], ("getitem", slice(0, 10)))
|
|
|
|
a[0:10] = "foo"
|
|
|
|
self.assertEqual(a.setitem, (slice(0, 10), "foo"))
|
|
|
|
del a[0:10]
|
|
|
|
self.assertEqual(a.delitem, (slice(0, 10)))
|
|
|
|
|
2022-04-17 15:04:29 -03:00
|
|
|
def test_load_attr_extended_arg(self):
|
|
|
|
# https://github.com/python/cpython/issues/91625
|
|
|
|
class Numbers:
|
|
|
|
def __getattr__(self, attr):
|
|
|
|
return int(attr.lstrip("_"))
|
|
|
|
attrs = ", ".join(f"Z._{n:03d}" for n in range(280))
|
|
|
|
code = f"def number_attrs(Z):\n return [ {attrs} ]"
|
|
|
|
ns = {}
|
|
|
|
exec(code, ns)
|
|
|
|
number_attrs = ns["number_attrs"]
|
2023-09-20 13:58:23 -03:00
|
|
|
# Warm up the function for quickening (PEP 659)
|
2022-04-17 15:04:29 -03:00
|
|
|
for _ in range(30):
|
|
|
|
self.assertEqual(number_attrs(Numbers()), list(range(280)))
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_methods(self):
|
|
|
|
# Testing methods...
|
|
|
|
class C(object):
|
|
|
|
def __init__(self, x):
|
|
|
|
self.x = x
|
|
|
|
def foo(self):
|
|
|
|
return self.x
|
|
|
|
c1 = C(1)
|
|
|
|
self.assertEqual(c1.foo(), 1)
|
|
|
|
class D(C):
|
|
|
|
boo = C.foo
|
|
|
|
goo = c1.foo
|
|
|
|
d2 = D(2)
|
|
|
|
self.assertEqual(d2.foo(), 2)
|
|
|
|
self.assertEqual(d2.boo(), 2)
|
|
|
|
self.assertEqual(d2.goo(), 1)
|
|
|
|
class E(object):
|
|
|
|
foo = C.foo
|
|
|
|
self.assertEqual(E().foo.__func__, C.foo) # i.e., unbound
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(repr(C.foo.__get__(C(1))).startswith("<bound method "))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2019-04-01 05:56:11 -03:00
|
|
|
@support.impl_detail("testing error message from implementation")
|
|
|
|
def test_methods_in_c(self):
|
|
|
|
# This test checks error messages in builtin method descriptor.
|
|
|
|
# It is allowed that other Python implementations use
|
|
|
|
# different error messages.
|
|
|
|
set_add = set.add
|
|
|
|
|
2019-11-05 11:48:04 -04:00
|
|
|
expected_errmsg = "unbound method set.add() needs an argument"
|
2019-04-01 05:56:11 -03:00
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
set_add()
|
|
|
|
self.assertEqual(cm.exception.args[0], expected_errmsg)
|
|
|
|
|
|
|
|
expected_errmsg = "descriptor 'add' for 'set' objects doesn't apply to a 'int' object"
|
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
set_add(0)
|
|
|
|
self.assertEqual(cm.exception.args[0], expected_errmsg)
|
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
set_add.__get__(0)
|
|
|
|
self.assertEqual(cm.exception.args[0], expected_errmsg)
|
|
|
|
|
2009-05-08 00:25:19 -03:00
|
|
|
def test_special_method_lookup(self):
|
|
|
|
# The lookup of special methods bypasses __getattr__ and
|
|
|
|
# __getattribute__, but they still can be descriptors.
|
|
|
|
|
|
|
|
def run_context(manager):
|
|
|
|
with manager:
|
|
|
|
pass
|
|
|
|
def iden(self):
|
|
|
|
return self
|
|
|
|
def hello(self):
|
|
|
|
return b"hello"
|
2009-05-09 14:21:13 -03:00
|
|
|
def empty_seq(self):
|
|
|
|
return []
|
2013-04-13 18:20:36 -03:00
|
|
|
def zero(self):
|
2009-05-09 15:15:04 -03:00
|
|
|
return 0
|
2010-01-03 21:10:28 -04:00
|
|
|
def complex_num(self):
|
|
|
|
return 1j
|
2009-05-09 15:15:04 -03:00
|
|
|
def stop(self):
|
|
|
|
raise StopIteration
|
2009-05-16 18:55:24 -03:00
|
|
|
def return_true(self, thing=None):
|
|
|
|
return True
|
|
|
|
def do_isinstance(obj):
|
|
|
|
return isinstance(int, obj)
|
|
|
|
def do_issubclass(obj):
|
|
|
|
return issubclass(int, obj)
|
2009-05-27 00:08:59 -03:00
|
|
|
def do_dict_missing(checker):
|
|
|
|
class DictSub(checker.__class__, dict):
|
|
|
|
pass
|
|
|
|
self.assertEqual(DictSub()["hi"], 4)
|
|
|
|
def some_number(self_, key):
|
|
|
|
self.assertEqual(key, "hi")
|
|
|
|
return 4
|
2009-06-28 00:18:59 -03:00
|
|
|
def swallow(*args): pass
|
2010-06-04 21:45:37 -03:00
|
|
|
def format_impl(self, spec):
|
|
|
|
return "hello"
|
2009-05-08 00:25:19 -03:00
|
|
|
|
|
|
|
# It would be nice to have every special method tested here, but I'm
|
|
|
|
# only listing the ones I can remember outside of typeobject.c, since it
|
|
|
|
# does it right.
|
|
|
|
specials = [
|
2009-05-16 18:55:24 -03:00
|
|
|
("__bytes__", bytes, hello, set(), {}),
|
|
|
|
("__reversed__", reversed, empty_seq, set(), {}),
|
|
|
|
("__length_hint__", list, zero, set(),
|
2009-05-09 15:15:04 -03:00
|
|
|
{"__iter__" : iden, "__next__" : stop}),
|
2009-05-16 18:55:24 -03:00
|
|
|
("__sizeof__", sys.getsizeof, zero, set(), {}),
|
|
|
|
("__instancecheck__", do_isinstance, return_true, set(), {}),
|
2009-05-27 00:08:59 -03:00
|
|
|
("__missing__", do_dict_missing, some_number,
|
|
|
|
set(("__class__",)), {}),
|
2009-05-16 18:55:24 -03:00
|
|
|
("__subclasscheck__", do_issubclass, return_true,
|
|
|
|
set(("__bases__",)), {}),
|
2009-06-28 00:18:59 -03:00
|
|
|
("__enter__", run_context, iden, set(), {"__exit__" : swallow}),
|
|
|
|
("__exit__", run_context, swallow, set(), {"__enter__" : iden}),
|
2010-01-03 21:10:28 -04:00
|
|
|
("__complex__", complex, complex_num, set(), {}),
|
2010-06-04 21:45:37 -03:00
|
|
|
("__format__", format, format_impl, set(), {}),
|
2010-07-01 12:16:55 -03:00
|
|
|
("__floor__", math.floor, zero, set(), {}),
|
|
|
|
("__trunc__", math.trunc, zero, set(), {}),
|
2010-07-02 10:46:42 -03:00
|
|
|
("__ceil__", math.ceil, zero, set(), {}),
|
2011-05-23 18:11:05 -03:00
|
|
|
("__dir__", dir, empty_seq, set(), {}),
|
2013-04-13 18:19:01 -03:00
|
|
|
("__round__", round, zero, set(), {}),
|
2009-05-08 00:25:19 -03:00
|
|
|
]
|
|
|
|
|
|
|
|
class Checker(object):
|
|
|
|
def __getattr__(self, attr, test=self):
|
|
|
|
test.fail("__getattr__ called with {0}".format(attr))
|
|
|
|
def __getattribute__(self, attr, test=self):
|
2009-05-16 18:55:24 -03:00
|
|
|
if attr not in ok:
|
|
|
|
test.fail("__getattribute__ called with {0}".format(attr))
|
2009-05-27 00:08:59 -03:00
|
|
|
return object.__getattribute__(self, attr)
|
2009-05-08 00:25:19 -03:00
|
|
|
class SpecialDescr(object):
|
|
|
|
def __init__(self, impl):
|
|
|
|
self.impl = impl
|
|
|
|
def __get__(self, obj, owner):
|
|
|
|
record.append(1)
|
2009-05-08 15:18:45 -03:00
|
|
|
return self.impl.__get__(obj, owner)
|
2009-05-25 00:10:48 -03:00
|
|
|
class MyException(Exception):
|
|
|
|
pass
|
|
|
|
class ErrDescr(object):
|
|
|
|
def __get__(self, obj, owner):
|
|
|
|
raise MyException
|
2009-05-08 00:25:19 -03:00
|
|
|
|
2009-05-16 18:55:24 -03:00
|
|
|
for name, runner, meth_impl, ok, env in specials:
|
2009-05-08 00:25:19 -03:00
|
|
|
class X(Checker):
|
|
|
|
pass
|
2009-05-09 15:15:04 -03:00
|
|
|
for attr, obj in env.items():
|
|
|
|
setattr(X, attr, obj)
|
2009-05-08 15:18:45 -03:00
|
|
|
setattr(X, name, meth_impl)
|
2009-05-08 00:25:19 -03:00
|
|
|
runner(X())
|
|
|
|
|
|
|
|
record = []
|
|
|
|
class X(Checker):
|
|
|
|
pass
|
2009-05-09 15:15:04 -03:00
|
|
|
for attr, obj in env.items():
|
|
|
|
setattr(X, attr, obj)
|
2009-05-08 00:25:19 -03:00
|
|
|
setattr(X, name, SpecialDescr(meth_impl))
|
|
|
|
runner(X())
|
|
|
|
self.assertEqual(record, [1], name)
|
|
|
|
|
2009-05-25 00:10:48 -03:00
|
|
|
class X(Checker):
|
|
|
|
pass
|
|
|
|
for attr, obj in env.items():
|
|
|
|
setattr(X, attr, obj)
|
|
|
|
setattr(X, name, ErrDescr())
|
2011-05-24 21:31:01 -03:00
|
|
|
self.assertRaises(MyException, runner, X())
|
2009-05-25 00:10:48 -03:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_specials(self):
|
|
|
|
# Testing special operators...
|
|
|
|
# Test operators like __hash__ for which a built-in default exists
|
|
|
|
|
|
|
|
# Test the default behavior for static classes
|
|
|
|
class C(object):
|
|
|
|
def __getitem__(self, i):
|
|
|
|
if 0 <= i < 10: return i
|
|
|
|
raise IndexError
|
|
|
|
c1 = C()
|
|
|
|
c2 = C()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertFalse(not c1)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertNotEqual(id(c1), id(c2))
|
|
|
|
hash(c1)
|
|
|
|
hash(c2)
|
|
|
|
self.assertEqual(c1, c1)
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(c1 != c2)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertFalse(c1 != c1)
|
|
|
|
self.assertFalse(c1 == c2)
|
2008-02-05 14:13:15 -04:00
|
|
|
# Note that the module name appears in str/repr, and that varies
|
|
|
|
# depending on whether this test is run standalone or from a framework.
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertGreaterEqual(str(c1).find('C object at '), 0)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(str(c1), repr(c1))
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertNotIn(-1, c1)
|
2008-02-05 14:13:15 -04:00
|
|
|
for i in range(10):
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn(i, c1)
|
2010-01-23 11:40:09 -04:00
|
|
|
self.assertNotIn(10, c1)
|
2008-02-05 14:13:15 -04:00
|
|
|
# Test the default behavior for dynamic classes
|
|
|
|
class D(object):
|
|
|
|
def __getitem__(self, i):
|
|
|
|
if 0 <= i < 10: return i
|
|
|
|
raise IndexError
|
|
|
|
d1 = D()
|
|
|
|
d2 = D()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertFalse(not d1)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertNotEqual(id(d1), id(d2))
|
|
|
|
hash(d1)
|
|
|
|
hash(d2)
|
|
|
|
self.assertEqual(d1, d1)
|
|
|
|
self.assertNotEqual(d1, d2)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertFalse(d1 != d1)
|
|
|
|
self.assertFalse(d1 == d2)
|
2008-02-05 14:13:15 -04:00
|
|
|
# Note that the module name appears in str/repr, and that varies
|
|
|
|
# depending on whether this test is run standalone or from a framework.
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertGreaterEqual(str(d1).find('D object at '), 0)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(str(d1), repr(d1))
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertNotIn(-1, d1)
|
2008-02-05 14:13:15 -04:00
|
|
|
for i in range(10):
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn(i, d1)
|
2010-01-23 11:40:09 -04:00
|
|
|
self.assertNotIn(10, d1)
|
2008-10-16 16:34:46 -03:00
|
|
|
# Test overridden behavior
|
2008-02-05 14:13:15 -04:00
|
|
|
class Proxy(object):
|
|
|
|
def __init__(self, x):
|
|
|
|
self.x = x
|
|
|
|
def __bool__(self):
|
|
|
|
return not not self.x
|
|
|
|
def __hash__(self):
|
|
|
|
return hash(self.x)
|
|
|
|
def __eq__(self, other):
|
|
|
|
return self.x == other
|
|
|
|
def __ne__(self, other):
|
|
|
|
return self.x != other
|
2008-10-16 16:34:46 -03:00
|
|
|
def __ge__(self, other):
|
|
|
|
return self.x >= other
|
|
|
|
def __gt__(self, other):
|
|
|
|
return self.x > other
|
|
|
|
def __le__(self, other):
|
|
|
|
return self.x <= other
|
|
|
|
def __lt__(self, other):
|
|
|
|
return self.x < other
|
2008-02-05 14:13:15 -04:00
|
|
|
def __str__(self):
|
|
|
|
return "Proxy:%s" % self.x
|
|
|
|
def __repr__(self):
|
|
|
|
return "Proxy(%r)" % self.x
|
|
|
|
def __contains__(self, value):
|
|
|
|
return value in self.x
|
|
|
|
p0 = Proxy(0)
|
|
|
|
p1 = Proxy(1)
|
|
|
|
p_1 = Proxy(-1)
|
|
|
|
self.assertFalse(p0)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertFalse(not p1)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(hash(p0), hash(0))
|
|
|
|
self.assertEqual(p0, p0)
|
|
|
|
self.assertNotEqual(p0, p1)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertFalse(p0 != p0)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(not p0, p1)
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(p0 < p1)
|
|
|
|
self.assertTrue(p0 <= p1)
|
|
|
|
self.assertTrue(p1 > p0)
|
|
|
|
self.assertTrue(p1 >= p0)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(str(p0), "Proxy:0")
|
|
|
|
self.assertEqual(repr(p0), "Proxy(0)")
|
|
|
|
p10 = Proxy(range(10))
|
2010-01-23 11:40:09 -04:00
|
|
|
self.assertNotIn(-1, p10)
|
2008-02-05 14:13:15 -04:00
|
|
|
for i in range(10):
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn(i, p10)
|
2010-01-23 11:40:09 -04:00
|
|
|
self.assertNotIn(10, p10)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_weakrefs(self):
|
|
|
|
# Testing weak references...
|
|
|
|
import weakref
|
|
|
|
class C(object):
|
|
|
|
pass
|
|
|
|
c = C()
|
|
|
|
r = weakref.ref(c)
|
|
|
|
self.assertEqual(r(), c)
|
|
|
|
del c
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(r(), None)
|
|
|
|
del r
|
|
|
|
class NoWeak(object):
|
|
|
|
__slots__ = ['foo']
|
|
|
|
no = NoWeak()
|
|
|
|
try:
|
|
|
|
weakref.ref(no)
|
|
|
|
except TypeError as msg:
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIn("weak reference", str(msg))
|
2008-02-05 14:13:15 -04:00
|
|
|
else:
|
|
|
|
self.fail("weakref.ref(no) should be illegal")
|
|
|
|
class Weak(object):
|
|
|
|
__slots__ = ['foo', '__weakref__']
|
|
|
|
yes = Weak()
|
|
|
|
r = weakref.ref(yes)
|
|
|
|
self.assertEqual(r(), yes)
|
|
|
|
del yes
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(r(), None)
|
|
|
|
del r
|
|
|
|
|
|
|
|
def test_properties(self):
|
|
|
|
# Testing property...
|
|
|
|
class C(object):
|
|
|
|
def getx(self):
|
|
|
|
return self.__x
|
|
|
|
def setx(self, value):
|
|
|
|
self.__x = value
|
|
|
|
def delx(self):
|
|
|
|
del self.__x
|
|
|
|
x = property(getx, setx, delx, doc="I'm the x property.")
|
|
|
|
a = C()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "x")
|
2008-02-05 14:13:15 -04:00
|
|
|
a.x = 42
|
|
|
|
self.assertEqual(a._C__x, 42)
|
|
|
|
self.assertEqual(a.x, 42)
|
|
|
|
del a.x
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "x")
|
|
|
|
self.assertNotHasAttr(a, "_C__x")
|
2008-02-05 14:13:15 -04:00
|
|
|
C.x.__set__(a, 100)
|
|
|
|
self.assertEqual(C.x.__get__(a), 100)
|
|
|
|
C.x.__delete__(a)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(a, "x")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
raw = C.__dict__['x']
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(raw, property)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
attrs = dir(raw)
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn("__doc__", attrs)
|
|
|
|
self.assertIn("fget", attrs)
|
|
|
|
self.assertIn("fset", attrs)
|
|
|
|
self.assertIn("fdel", attrs)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
self.assertEqual(raw.__doc__, "I'm the x property.")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(raw.fget, C.__dict__['getx'])
|
|
|
|
self.assertIs(raw.fset, C.__dict__['setx'])
|
|
|
|
self.assertIs(raw.fdel, C.__dict__['delx'])
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2015-05-13 05:09:59 -03:00
|
|
|
for attr in "fget", "fset", "fdel":
|
2008-02-05 14:13:15 -04:00
|
|
|
try:
|
|
|
|
setattr(raw, attr, 42)
|
|
|
|
except AttributeError as msg:
|
|
|
|
if str(msg).find('readonly') < 0:
|
|
|
|
self.fail("when setting readonly attr %r on a property, "
|
|
|
|
"got unexpected AttributeError msg %r" % (attr, str(msg)))
|
|
|
|
else:
|
|
|
|
self.fail("expected AttributeError from trying to set readonly %r "
|
|
|
|
"attr on a property" % attr)
|
|
|
|
|
2015-05-13 05:09:59 -03:00
|
|
|
raw.__doc__ = 42
|
|
|
|
self.assertEqual(raw.__doc__, 42)
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class D(object):
|
|
|
|
__getitem__ = property(lambda s: 1/0)
|
|
|
|
|
|
|
|
d = D()
|
|
|
|
try:
|
|
|
|
for i in d:
|
|
|
|
str(i)
|
|
|
|
except ZeroDivisionError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected ZeroDivisionError from bad property")
|
|
|
|
|
2010-02-23 21:46:21 -04:00
|
|
|
@unittest.skipIf(sys.flags.optimize >= 2,
|
|
|
|
"Docstrings are omitted with -O2 and above")
|
|
|
|
def test_properties_doc_attrib(self):
|
2008-02-05 14:13:15 -04:00
|
|
|
class E(object):
|
|
|
|
def getter(self):
|
|
|
|
"getter method"
|
|
|
|
return 0
|
|
|
|
def setter(self_, value):
|
|
|
|
"setter method"
|
|
|
|
pass
|
|
|
|
prop = property(getter)
|
|
|
|
self.assertEqual(prop.__doc__, "getter method")
|
|
|
|
prop2 = property(fset=setter)
|
|
|
|
self.assertEqual(prop2.__doc__, None)
|
|
|
|
|
2014-02-07 04:06:39 -04:00
|
|
|
@support.cpython_only
|
2010-02-23 21:46:21 -04:00
|
|
|
def test_testcapi_no_segfault(self):
|
2008-02-05 14:13:15 -04:00
|
|
|
# this segfaulted in 2.5b2
|
|
|
|
try:
|
|
|
|
import _testcapi
|
|
|
|
except ImportError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
class X(object):
|
|
|
|
p = property(_testcapi.test_with_docstring)
|
|
|
|
|
|
|
|
def test_properties_plus(self):
|
|
|
|
class C(object):
|
|
|
|
foo = property(doc="hello")
|
|
|
|
@foo.getter
|
|
|
|
def foo(self):
|
|
|
|
return self._foo
|
|
|
|
@foo.setter
|
|
|
|
def foo(self, value):
|
|
|
|
self._foo = abs(value)
|
|
|
|
@foo.deleter
|
|
|
|
def foo(self):
|
|
|
|
del self._foo
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(C.foo.__doc__, "hello")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(c, "foo")
|
2008-02-05 14:13:15 -04:00
|
|
|
c.foo = -42
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertHasAttr(c, '_foo')
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(c._foo, 42)
|
|
|
|
self.assertEqual(c.foo, 42)
|
|
|
|
del c.foo
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(c, '_foo')
|
|
|
|
self.assertNotHasAttr(c, "foo")
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class D(C):
|
|
|
|
@C.foo.deleter
|
|
|
|
def foo(self):
|
|
|
|
try:
|
|
|
|
del self._foo
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
d.foo = 24
|
|
|
|
self.assertEqual(d.foo, 24)
|
|
|
|
del d.foo
|
|
|
|
del d.foo
|
|
|
|
|
|
|
|
class E(object):
|
|
|
|
@property
|
|
|
|
def foo(self):
|
|
|
|
return self._foo
|
|
|
|
@foo.setter
|
|
|
|
def foo(self, value):
|
|
|
|
raise RuntimeError
|
|
|
|
@foo.setter
|
|
|
|
def foo(self, value):
|
|
|
|
self._foo = abs(value)
|
|
|
|
@foo.deleter
|
|
|
|
def foo(self, value=None):
|
|
|
|
del self._foo
|
|
|
|
|
|
|
|
e = E()
|
|
|
|
e.foo = -42
|
|
|
|
self.assertEqual(e.foo, 42)
|
|
|
|
del e.foo
|
|
|
|
|
|
|
|
class F(E):
|
|
|
|
@E.foo.deleter
|
|
|
|
def foo(self):
|
|
|
|
del self._foo
|
|
|
|
@foo.setter
|
|
|
|
def foo(self, value):
|
|
|
|
self._foo = max(0, value)
|
|
|
|
f = F()
|
|
|
|
f.foo = -10
|
|
|
|
self.assertEqual(f.foo, 0)
|
|
|
|
del f.foo
|
|
|
|
|
|
|
|
def test_dict_constructors(self):
|
|
|
|
# Testing dict constructor ...
|
|
|
|
d = dict()
|
|
|
|
self.assertEqual(d, {})
|
|
|
|
d = dict({})
|
|
|
|
self.assertEqual(d, {})
|
|
|
|
d = dict({1: 2, 'a': 'b'})
|
|
|
|
self.assertEqual(d, {1: 2, 'a': 'b'})
|
|
|
|
self.assertEqual(d, dict(list(d.items())))
|
|
|
|
self.assertEqual(d, dict(iter(d.items())))
|
|
|
|
d = dict({'one':1, 'two':2})
|
|
|
|
self.assertEqual(d, dict(one=1, two=2))
|
|
|
|
self.assertEqual(d, dict(**d))
|
|
|
|
self.assertEqual(d, dict({"one": 1}, two=2))
|
|
|
|
self.assertEqual(d, dict([("two", 2)], one=1))
|
|
|
|
self.assertEqual(d, dict([("one", 100), ("two", 200)], **d))
|
|
|
|
self.assertEqual(d, dict(**d))
|
|
|
|
|
|
|
|
for badarg in 0, 0, 0j, "0", [0], (0,):
|
|
|
|
try:
|
|
|
|
dict(badarg)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
except ValueError:
|
|
|
|
if badarg == "0":
|
|
|
|
# It's a sequence, and its elements are also sequences (gotta
|
|
|
|
# love strings <wink>), but they aren't of length 2, so this
|
|
|
|
# one seemed better as a ValueError than a TypeError.
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("no TypeError from dict(%r)" % badarg)
|
|
|
|
else:
|
|
|
|
self.fail("no TypeError from dict(%r)" % badarg)
|
2002-04-15 22:59:17 -03:00
|
|
|
|
2022-01-08 04:14:40 -04:00
|
|
|
with self.assertRaises(TypeError):
|
2008-02-05 14:13:15 -04:00
|
|
|
dict({}, {})
|
|
|
|
|
|
|
|
class Mapping:
|
|
|
|
# Lacks a .keys() method; will be added later.
|
|
|
|
dict = {1:2, 3:4, 'a':1j}
|
|
|
|
|
|
|
|
try:
|
|
|
|
dict(Mapping())
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("no TypeError from dict(incomplete mapping)")
|
|
|
|
|
|
|
|
Mapping.keys = lambda self: list(self.dict.keys())
|
|
|
|
Mapping.__getitem__ = lambda self, i: self.dict[i]
|
|
|
|
d = dict(Mapping())
|
|
|
|
self.assertEqual(d, Mapping.dict)
|
|
|
|
|
|
|
|
# Init from sequence of iterable objects, each producing a 2-sequence.
|
|
|
|
class AddressBookEntry:
|
|
|
|
def __init__(self, first, last):
|
|
|
|
self.first = first
|
|
|
|
self.last = last
|
|
|
|
def __iter__(self):
|
|
|
|
return iter([self.first, self.last])
|
|
|
|
|
|
|
|
d = dict([AddressBookEntry('Tim', 'Warsaw'),
|
|
|
|
AddressBookEntry('Barry', 'Peters'),
|
|
|
|
AddressBookEntry('Tim', 'Peters'),
|
|
|
|
AddressBookEntry('Barry', 'Warsaw')])
|
|
|
|
self.assertEqual(d, {'Barry': 'Warsaw', 'Tim': 'Peters'})
|
|
|
|
|
|
|
|
d = dict(zip(range(4), range(1, 5)))
|
|
|
|
self.assertEqual(d, dict([(i, i+1) for i in range(4)]))
|
|
|
|
|
|
|
|
# Bad sequence lengths.
|
|
|
|
for bad in [('tooshort',)], [('too', 'long', 'by 1')]:
|
|
|
|
try:
|
|
|
|
dict(bad)
|
|
|
|
except ValueError:
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("no ValueError from dict(%r)" % bad)
|
|
|
|
|
|
|
|
def test_dir(self):
|
|
|
|
# Testing dir() ...
|
|
|
|
junk = 12
|
|
|
|
self.assertEqual(dir(), ['junk', 'self'])
|
|
|
|
del junk
|
|
|
|
|
|
|
|
# Just make sure these don't blow up!
|
|
|
|
for arg in 2, 2, 2j, 2e0, [2], "2", b"2", (2,), {2:2}, type, self.test_dir:
|
|
|
|
dir(arg)
|
|
|
|
|
|
|
|
# Test dir on new-style classes. Since these have object as a
|
|
|
|
# base class, a lot more gets sucked in.
|
|
|
|
def interesting(strings):
|
|
|
|
return [s for s in strings if not s.startswith('_')]
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
Cdata = 1
|
|
|
|
def Cmethod(self): pass
|
|
|
|
|
|
|
|
cstuff = ['Cdata', 'Cmethod']
|
|
|
|
self.assertEqual(interesting(dir(C)), cstuff)
|
|
|
|
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(interesting(dir(c)), cstuff)
|
2010-01-18 20:09:57 -04:00
|
|
|
## self.assertIn('__self__', dir(C.Cmethod))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
c.cdata = 2
|
|
|
|
c.cmethod = lambda self: 0
|
|
|
|
self.assertEqual(interesting(dir(c)), cstuff + ['cdata', 'cmethod'])
|
2010-01-18 20:09:57 -04:00
|
|
|
## self.assertIn('__self__', dir(c.Cmethod))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class A(C):
|
|
|
|
Adata = 1
|
|
|
|
def Amethod(self): pass
|
|
|
|
|
|
|
|
astuff = ['Adata', 'Amethod'] + cstuff
|
|
|
|
self.assertEqual(interesting(dir(A)), astuff)
|
2010-01-18 20:09:57 -04:00
|
|
|
## self.assertIn('__self__', dir(A.Amethod))
|
2008-02-05 14:13:15 -04:00
|
|
|
a = A()
|
|
|
|
self.assertEqual(interesting(dir(a)), astuff)
|
|
|
|
a.adata = 42
|
|
|
|
a.amethod = lambda self: 3
|
|
|
|
self.assertEqual(interesting(dir(a)), astuff + ['adata', 'amethod'])
|
2010-01-18 20:09:57 -04:00
|
|
|
## self.assertIn('__self__', dir(a.Amethod))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
# Try a module subclass.
|
|
|
|
class M(type(sys)):
|
|
|
|
pass
|
|
|
|
minstance = M("m")
|
|
|
|
minstance.b = 2
|
|
|
|
minstance.a = 1
|
2013-05-04 14:56:58 -03:00
|
|
|
default_attributes = ['__name__', '__doc__', '__package__',
|
2013-11-22 12:05:39 -04:00
|
|
|
'__loader__', '__spec__']
|
2013-05-04 14:56:58 -03:00
|
|
|
names = [x for x in dir(minstance) if x not in default_attributes]
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(names, ['a', 'b'])
|
|
|
|
|
|
|
|
class M2(M):
|
|
|
|
def getdict(self):
|
|
|
|
return "Not a dict!"
|
|
|
|
__dict__ = property(getdict)
|
|
|
|
|
|
|
|
m2instance = M2("m2")
|
|
|
|
m2instance.b = 2
|
|
|
|
m2instance.a = 1
|
|
|
|
self.assertEqual(m2instance.__dict__, "Not a dict!")
|
2022-01-07 23:51:51 -04:00
|
|
|
with self.assertRaises(TypeError):
|
2008-02-05 14:13:15 -04:00
|
|
|
dir(m2instance)
|
|
|
|
|
2020-03-03 14:50:17 -04:00
|
|
|
# Two essentially featureless objects, (Ellipsis just inherits stuff
|
|
|
|
# from object.
|
|
|
|
self.assertEqual(dir(object()), dir(Ellipsis))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
# Nasty test case for proxied objects
|
|
|
|
class Wrapper(object):
|
|
|
|
def __init__(self, obj):
|
|
|
|
self.__obj = obj
|
|
|
|
def __repr__(self):
|
|
|
|
return "Wrapper(%s)" % repr(self.__obj)
|
|
|
|
def __getitem__(self, key):
|
|
|
|
return Wrapper(self.__obj[key])
|
|
|
|
def __len__(self):
|
|
|
|
return len(self.__obj)
|
|
|
|
def __getattr__(self, name):
|
|
|
|
return Wrapper(getattr(self.__obj, name))
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
def __getclass(self):
|
|
|
|
return Wrapper(type(self))
|
|
|
|
__class__ = property(__getclass)
|
|
|
|
|
|
|
|
dir(C()) # This used to segfault
|
|
|
|
|
|
|
|
def test_supers(self):
|
|
|
|
# Testing super...
|
|
|
|
|
|
|
|
class A(object):
|
|
|
|
def meth(self, a):
|
|
|
|
return "A(%r)" % a
|
|
|
|
|
|
|
|
self.assertEqual(A().meth(1), "A(1)")
|
|
|
|
|
|
|
|
class B(A):
|
|
|
|
def __init__(self):
|
|
|
|
self.__super = super(B, self)
|
|
|
|
def meth(self, a):
|
|
|
|
return "B(%r)" % a + self.__super.meth(a)
|
|
|
|
|
|
|
|
self.assertEqual(B().meth(2), "B(2)A(2)")
|
|
|
|
|
|
|
|
class C(A):
|
|
|
|
def meth(self, a):
|
|
|
|
return "C(%r)" % a + self.__super.meth(a)
|
|
|
|
C._C__super = super(C)
|
|
|
|
|
|
|
|
self.assertEqual(C().meth(3), "C(3)A(3)")
|
|
|
|
|
|
|
|
class D(C, B):
|
|
|
|
def meth(self, a):
|
|
|
|
return "D(%r)" % a + super(D, self).meth(a)
|
|
|
|
|
|
|
|
self.assertEqual(D().meth(4), "D(4)C(4)B(4)A(4)")
|
|
|
|
|
|
|
|
# Test for subclassing super
|
|
|
|
|
|
|
|
class mysuper(super):
|
|
|
|
def __init__(self, *args):
|
|
|
|
return super(mysuper, self).__init__(*args)
|
|
|
|
|
|
|
|
class E(D):
|
|
|
|
def meth(self, a):
|
|
|
|
return "E(%r)" % a + mysuper(E, self).meth(a)
|
|
|
|
|
|
|
|
self.assertEqual(E().meth(5), "E(5)D(5)C(5)B(5)A(5)")
|
|
|
|
|
|
|
|
class F(E):
|
|
|
|
def meth(self, a):
|
|
|
|
s = self.__super # == mysuper(F, self)
|
|
|
|
return "F(%r)[%s]" % (a, s.__class__.__name__) + s.meth(a)
|
|
|
|
F._F__super = mysuper(F)
|
|
|
|
|
|
|
|
self.assertEqual(F().meth(6), "F(6)[mysuper]E(6)D(6)C(6)B(6)A(6)")
|
|
|
|
|
|
|
|
# Make sure certain errors are raised
|
|
|
|
|
|
|
|
try:
|
|
|
|
super(D, 42)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow super(D, 42)")
|
|
|
|
|
|
|
|
try:
|
|
|
|
super(D, C())
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow super(D, C())")
|
|
|
|
|
|
|
|
try:
|
|
|
|
super(D).__get__(12)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow super(D).__get__(12)")
|
|
|
|
|
|
|
|
try:
|
|
|
|
super(D).__get__(C())
|
|
|
|
except TypeError:
|
|
|
|
pass
|
2001-09-02 05:22:48 -03:00
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't allow super(D).__get__(C())")
|
|
|
|
|
|
|
|
# Make sure data descriptors can be overridden and accessed via super
|
|
|
|
# (new feature in Python 2.3)
|
|
|
|
|
|
|
|
class DDbase(object):
|
|
|
|
def getx(self): return 42
|
|
|
|
x = property(getx)
|
|
|
|
|
|
|
|
class DDsub(DDbase):
|
|
|
|
def getx(self): return "hello"
|
|
|
|
x = property(getx)
|
|
|
|
|
|
|
|
dd = DDsub()
|
|
|
|
self.assertEqual(dd.x, "hello")
|
|
|
|
self.assertEqual(super(DDsub, dd).x, 42)
|
|
|
|
|
|
|
|
# Ensure that super() lookup of descriptor from classmethod
|
|
|
|
# works (SF ID# 743627)
|
|
|
|
|
|
|
|
class Base(object):
|
|
|
|
aProp = property(lambda self: "foo")
|
|
|
|
|
|
|
|
class Sub(Base):
|
|
|
|
@classmethod
|
|
|
|
def test(klass):
|
|
|
|
return super(Sub,klass).aProp
|
|
|
|
|
|
|
|
self.assertEqual(Sub.test(), Base.aProp)
|
|
|
|
|
|
|
|
# Verify that super() doesn't allow keyword args
|
2019-08-26 19:41:11 -03:00
|
|
|
with self.assertRaises(TypeError):
|
2008-02-05 14:13:15 -04:00
|
|
|
super(Base, kw=1)
|
|
|
|
|
|
|
|
def test_basic_inheritance(self):
|
|
|
|
# Testing inheritance from basic types...
|
|
|
|
|
|
|
|
class hexint(int):
|
|
|
|
def __repr__(self):
|
|
|
|
return hex(self)
|
|
|
|
def __add__(self, other):
|
|
|
|
return hexint(int.__add__(self, other))
|
|
|
|
# (Note that overriding __radd__ doesn't work,
|
|
|
|
# because the int type gets first dibs.)
|
|
|
|
self.assertEqual(repr(hexint(7) + 9), "0x10")
|
|
|
|
self.assertEqual(repr(hexint(1000) + 7), "0x3ef")
|
|
|
|
a = hexint(12345)
|
|
|
|
self.assertEqual(a, 12345)
|
|
|
|
self.assertEqual(int(a), 12345)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(int(a).__class__, int)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(hash(a), hash(12345))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((+a).__class__, int)
|
|
|
|
self.assertIs((a >> 0).__class__, int)
|
|
|
|
self.assertIs((a << 0).__class__, int)
|
|
|
|
self.assertIs((hexint(0) << 12).__class__, int)
|
|
|
|
self.assertIs((hexint(0) >> 12).__class__, int)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class octlong(int):
|
|
|
|
__slots__ = []
|
|
|
|
def __str__(self):
|
2009-12-05 16:28:34 -04:00
|
|
|
return oct(self)
|
2008-02-05 14:13:15 -04:00
|
|
|
def __add__(self, other):
|
|
|
|
return self.__class__(super(octlong, self).__add__(other))
|
|
|
|
__radd__ = __add__
|
|
|
|
self.assertEqual(str(octlong(3) + 5), "0o10")
|
|
|
|
# (Note that overriding __radd__ here only seems to work
|
|
|
|
# because the example uses a short int left argument.)
|
|
|
|
self.assertEqual(str(5 + octlong(3000)), "0o5675")
|
|
|
|
a = octlong(12345)
|
|
|
|
self.assertEqual(a, 12345)
|
|
|
|
self.assertEqual(int(a), 12345)
|
|
|
|
self.assertEqual(hash(a), hash(12345))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(int(a).__class__, int)
|
|
|
|
self.assertIs((+a).__class__, int)
|
|
|
|
self.assertIs((-a).__class__, int)
|
|
|
|
self.assertIs((-octlong(0)).__class__, int)
|
|
|
|
self.assertIs((a >> 0).__class__, int)
|
|
|
|
self.assertIs((a << 0).__class__, int)
|
|
|
|
self.assertIs((a - 0).__class__, int)
|
|
|
|
self.assertIs((a * 1).__class__, int)
|
|
|
|
self.assertIs((a ** 1).__class__, int)
|
|
|
|
self.assertIs((a // 1).__class__, int)
|
|
|
|
self.assertIs((1 * a).__class__, int)
|
|
|
|
self.assertIs((a | 0).__class__, int)
|
|
|
|
self.assertIs((a ^ 0).__class__, int)
|
|
|
|
self.assertIs((a & -1).__class__, int)
|
|
|
|
self.assertIs((octlong(0) << 12).__class__, int)
|
|
|
|
self.assertIs((octlong(0) >> 12).__class__, int)
|
|
|
|
self.assertIs(abs(octlong(0)).__class__, int)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
# Because octlong overrides __add__, we can't check the absence of +0
|
|
|
|
# optimizations using octlong.
|
|
|
|
class longclone(int):
|
|
|
|
pass
|
|
|
|
a = longclone(1)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((a + 0).__class__, int)
|
|
|
|
self.assertIs((0 + a).__class__, int)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
# Check that negative clones don't segfault
|
|
|
|
a = longclone(-1)
|
|
|
|
self.assertEqual(a.__dict__, {})
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertEqual(int(a), -1) # self.assertTrue PyNumber_Long() copies the sign bit
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class precfloat(float):
|
|
|
|
__slots__ = ['prec']
|
|
|
|
def __init__(self, value=0.0, prec=12):
|
|
|
|
self.prec = int(prec)
|
|
|
|
def __repr__(self):
|
|
|
|
return "%.*g" % (self.prec, self)
|
|
|
|
self.assertEqual(repr(precfloat(1.1)), "1.1")
|
|
|
|
a = precfloat(12345)
|
|
|
|
self.assertEqual(a, 12345.0)
|
|
|
|
self.assertEqual(float(a), 12345.0)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(float(a).__class__, float)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(hash(a), hash(12345.0))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((+a).__class__, float)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class madcomplex(complex):
|
|
|
|
def __repr__(self):
|
|
|
|
return "%.17gj%+.17g" % (self.imag, self.real)
|
|
|
|
a = madcomplex(-3, 4)
|
|
|
|
self.assertEqual(repr(a), "4j-3")
|
|
|
|
base = complex(-3, 4)
|
|
|
|
self.assertEqual(base.__class__, complex)
|
|
|
|
self.assertEqual(a, base)
|
|
|
|
self.assertEqual(complex(a), base)
|
|
|
|
self.assertEqual(complex(a).__class__, complex)
|
|
|
|
a = madcomplex(a) # just trying another form of the constructor
|
|
|
|
self.assertEqual(repr(a), "4j-3")
|
|
|
|
self.assertEqual(a, base)
|
|
|
|
self.assertEqual(complex(a), base)
|
|
|
|
self.assertEqual(complex(a).__class__, complex)
|
|
|
|
self.assertEqual(hash(a), hash(base))
|
|
|
|
self.assertEqual((+a).__class__, complex)
|
|
|
|
self.assertEqual((a + 0).__class__, complex)
|
|
|
|
self.assertEqual(a + 0, base)
|
|
|
|
self.assertEqual((a - 0).__class__, complex)
|
|
|
|
self.assertEqual(a - 0, base)
|
|
|
|
self.assertEqual((a * 1).__class__, complex)
|
|
|
|
self.assertEqual(a * 1, base)
|
|
|
|
self.assertEqual((a / 1).__class__, complex)
|
|
|
|
self.assertEqual(a / 1, base)
|
|
|
|
|
|
|
|
class madtuple(tuple):
|
|
|
|
_rev = None
|
|
|
|
def rev(self):
|
|
|
|
if self._rev is not None:
|
|
|
|
return self._rev
|
|
|
|
L = list(self)
|
|
|
|
L.reverse()
|
|
|
|
self._rev = self.__class__(L)
|
|
|
|
return self._rev
|
|
|
|
a = madtuple((1,2,3,4,5,6,7,8,9,0))
|
|
|
|
self.assertEqual(a, (1,2,3,4,5,6,7,8,9,0))
|
|
|
|
self.assertEqual(a.rev(), madtuple((0,9,8,7,6,5,4,3,2,1)))
|
|
|
|
self.assertEqual(a.rev().rev(), madtuple((1,2,3,4,5,6,7,8,9,0)))
|
|
|
|
for i in range(512):
|
|
|
|
t = madtuple(range(i))
|
|
|
|
u = t.rev()
|
|
|
|
v = u.rev()
|
|
|
|
self.assertEqual(v, t)
|
|
|
|
a = madtuple((1,2,3,4,5))
|
|
|
|
self.assertEqual(tuple(a), (1,2,3,4,5))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(tuple(a).__class__, tuple)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(hash(a), hash((1,2,3,4,5)))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(a[:].__class__, tuple)
|
|
|
|
self.assertIs((a * 1).__class__, tuple)
|
|
|
|
self.assertIs((a * 0).__class__, tuple)
|
|
|
|
self.assertIs((a + ()).__class__, tuple)
|
2008-02-05 14:13:15 -04:00
|
|
|
a = madtuple(())
|
|
|
|
self.assertEqual(tuple(a), ())
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(tuple(a).__class__, tuple)
|
|
|
|
self.assertIs((a + a).__class__, tuple)
|
|
|
|
self.assertIs((a * 0).__class__, tuple)
|
|
|
|
self.assertIs((a * 1).__class__, tuple)
|
|
|
|
self.assertIs((a * 2).__class__, tuple)
|
|
|
|
self.assertIs(a[:].__class__, tuple)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
class madstring(str):
|
|
|
|
_rev = None
|
|
|
|
def rev(self):
|
|
|
|
if self._rev is not None:
|
|
|
|
return self._rev
|
|
|
|
L = list(self)
|
|
|
|
L.reverse()
|
|
|
|
self._rev = self.__class__("".join(L))
|
|
|
|
return self._rev
|
|
|
|
s = madstring("abcdefghijklmnopqrstuvwxyz")
|
|
|
|
self.assertEqual(s, "abcdefghijklmnopqrstuvwxyz")
|
|
|
|
self.assertEqual(s.rev(), madstring("zyxwvutsrqponmlkjihgfedcba"))
|
|
|
|
self.assertEqual(s.rev().rev(), madstring("abcdefghijklmnopqrstuvwxyz"))
|
|
|
|
for i in range(256):
|
|
|
|
s = madstring("".join(map(chr, range(i))))
|
|
|
|
t = s.rev()
|
|
|
|
u = t.rev()
|
|
|
|
self.assertEqual(u, s)
|
|
|
|
s = madstring("12345")
|
|
|
|
self.assertEqual(str(s), "12345")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(str(s).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
base = "\x00" * 5
|
|
|
|
s = madstring(base)
|
|
|
|
self.assertEqual(s, base)
|
|
|
|
self.assertEqual(str(s), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(str(s).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(hash(s), hash(base))
|
|
|
|
self.assertEqual({s: 1}[base], 1)
|
|
|
|
self.assertEqual({base: 1}[s], 1)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((s + "").__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s + "", base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(("" + s).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual("" + s, base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((s * 0).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s * 0, "")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((s * 1).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s * 1, base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((s * 2).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s * 2, base + base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s[:].__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s[:], base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s[0:0].__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s[0:0], "")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.strip().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.strip(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.lstrip().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.lstrip(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.rstrip().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.rstrip(), base)
|
|
|
|
identitytab = {}
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.translate(identitytab).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.translate(identitytab), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.replace("x", "x").__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.replace("x", "x"), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.ljust(len(s)).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.ljust(len(s)), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.rjust(len(s)).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.rjust(len(s)), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.center(len(s)).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.center(len(s)), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(s.lower().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(s.lower(), base)
|
|
|
|
|
|
|
|
class madunicode(str):
|
|
|
|
_rev = None
|
|
|
|
def rev(self):
|
|
|
|
if self._rev is not None:
|
|
|
|
return self._rev
|
|
|
|
L = list(self)
|
|
|
|
L.reverse()
|
|
|
|
self._rev = self.__class__("".join(L))
|
|
|
|
return self._rev
|
|
|
|
u = madunicode("ABCDEF")
|
|
|
|
self.assertEqual(u, "ABCDEF")
|
|
|
|
self.assertEqual(u.rev(), madunicode("FEDCBA"))
|
|
|
|
self.assertEqual(u.rev().rev(), madunicode("ABCDEF"))
|
|
|
|
base = "12345"
|
|
|
|
u = madunicode(base)
|
|
|
|
self.assertEqual(str(u), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(str(u).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(hash(u), hash(base))
|
|
|
|
self.assertEqual({u: 1}[base], 1)
|
|
|
|
self.assertEqual({base: 1}[u], 1)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.strip().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.strip(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.lstrip().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.lstrip(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.rstrip().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.rstrip(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.replace("x", "x").__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.replace("x", "x"), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.replace("xy", "xy").__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.replace("xy", "xy"), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.center(len(u)).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.center(len(u)), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.ljust(len(u)).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.ljust(len(u)), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.rjust(len(u)).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.rjust(len(u)), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.lower().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.lower(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.upper().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.upper(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.capitalize().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.capitalize(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u.title().__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u.title(), base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((u + "").__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u + "", base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(("" + u).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual("" + u, base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((u * 0).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u * 0, "")
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((u * 1).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u * 1, base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs((u * 2).__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u * 2, base + base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u[:].__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u[:], base)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(u[0:0].__class__, str)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(u[0:0], "")
|
|
|
|
|
|
|
|
class sublist(list):
|
|
|
|
pass
|
|
|
|
a = sublist(range(5))
|
|
|
|
self.assertEqual(a, list(range(5)))
|
|
|
|
a.append("hello")
|
|
|
|
self.assertEqual(a, list(range(5)) + ["hello"])
|
|
|
|
a[5] = 5
|
|
|
|
self.assertEqual(a, list(range(6)))
|
|
|
|
a.extend(range(6, 20))
|
|
|
|
self.assertEqual(a, list(range(20)))
|
|
|
|
a[-5:] = []
|
|
|
|
self.assertEqual(a, list(range(15)))
|
|
|
|
del a[10:15]
|
|
|
|
self.assertEqual(len(a), 10)
|
|
|
|
self.assertEqual(a, list(range(10)))
|
|
|
|
self.assertEqual(list(a), list(range(10)))
|
|
|
|
self.assertEqual(a[0], 0)
|
|
|
|
self.assertEqual(a[9], 9)
|
|
|
|
self.assertEqual(a[-10], 0)
|
|
|
|
self.assertEqual(a[-1], 9)
|
|
|
|
self.assertEqual(a[:5], list(range(5)))
|
|
|
|
|
|
|
|
## class CountedInput(file):
|
|
|
|
## """Counts lines read by self.readline().
|
|
|
|
##
|
|
|
|
## self.lineno is the 0-based ordinal of the last line read, up to
|
|
|
|
## a maximum of one greater than the number of lines in the file.
|
|
|
|
##
|
|
|
|
## self.ateof is true if and only if the final "" line has been read,
|
|
|
|
## at which point self.lineno stops incrementing, and further calls
|
|
|
|
## to readline() continue to return "".
|
|
|
|
## """
|
|
|
|
##
|
|
|
|
## lineno = 0
|
|
|
|
## ateof = 0
|
|
|
|
## def readline(self):
|
|
|
|
## if self.ateof:
|
|
|
|
## return ""
|
|
|
|
## s = file.readline(self)
|
|
|
|
## # Next line works too.
|
|
|
|
## # s = super(CountedInput, self).readline()
|
|
|
|
## self.lineno += 1
|
|
|
|
## if s == "":
|
|
|
|
## self.ateof = 1
|
|
|
|
## return s
|
|
|
|
##
|
2020-08-07 18:55:35 -03:00
|
|
|
## f = file(name=os_helper.TESTFN, mode='w')
|
2008-02-05 14:13:15 -04:00
|
|
|
## lines = ['a\n', 'b\n', 'c\n']
|
|
|
|
## try:
|
|
|
|
## f.writelines(lines)
|
|
|
|
## f.close()
|
2020-08-07 18:55:35 -03:00
|
|
|
## f = CountedInput(os_helper.TESTFN)
|
2008-02-05 14:13:15 -04:00
|
|
|
## for (i, expected) in zip(range(1, 5) + [4], lines + 2 * [""]):
|
|
|
|
## got = f.readline()
|
|
|
|
## self.assertEqual(expected, got)
|
|
|
|
## self.assertEqual(f.lineno, i)
|
|
|
|
## self.assertEqual(f.ateof, (i > len(lines)))
|
|
|
|
## f.close()
|
|
|
|
## finally:
|
|
|
|
## try:
|
|
|
|
## f.close()
|
|
|
|
## except:
|
|
|
|
## pass
|
2020-08-07 18:55:35 -03:00
|
|
|
## os_helper.unlink(os_helper.TESTFN)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_keywords(self):
|
|
|
|
# Testing keyword args to basic type constructors ...
|
2017-03-06 15:08:59 -04:00
|
|
|
with self.assertRaisesRegex(TypeError, 'keyword argument'):
|
|
|
|
int(x=1)
|
|
|
|
with self.assertRaisesRegex(TypeError, 'keyword argument'):
|
|
|
|
float(x=2)
|
|
|
|
with self.assertRaisesRegex(TypeError, 'keyword argument'):
|
|
|
|
bool(x=2)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(complex(imag=42, real=666), complex(666, 42))
|
|
|
|
self.assertEqual(str(object=500), '500')
|
|
|
|
self.assertEqual(str(object=b'abc', errors='strict'), 'abc')
|
2017-03-06 15:08:59 -04:00
|
|
|
with self.assertRaisesRegex(TypeError, 'keyword argument'):
|
|
|
|
tuple(sequence=range(3))
|
|
|
|
with self.assertRaisesRegex(TypeError, 'keyword argument'):
|
|
|
|
list(sequence=(0, 1, 2))
|
2008-02-05 14:13:15 -04:00
|
|
|
# note: as of Python 2.3, dict() no longer has an "items" keyword arg
|
|
|
|
|
|
|
|
for constructor in (int, float, int, complex, str, str,
|
|
|
|
tuple, list):
|
|
|
|
try:
|
|
|
|
constructor(bogus_keyword_arg=1)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected TypeError from bogus keyword argument to %r"
|
|
|
|
% constructor)
|
|
|
|
|
|
|
|
def test_str_subclass_as_dict_key(self):
|
|
|
|
# Testing a str subclass used as dict key ..
|
|
|
|
|
|
|
|
class cistr(str):
|
2019-08-30 17:21:19 -03:00
|
|
|
"""Subclass of str that computes __eq__ case-insensitively.
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
Also computes a hash code of the string in canonical form.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, value):
|
|
|
|
self.canonical = value.lower()
|
|
|
|
self.hashcode = hash(self.canonical)
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
if not isinstance(other, cistr):
|
|
|
|
other = cistr(other)
|
|
|
|
return self.canonical == other.canonical
|
|
|
|
|
|
|
|
def __hash__(self):
|
|
|
|
return self.hashcode
|
|
|
|
|
|
|
|
self.assertEqual(cistr('ABC'), 'abc')
|
|
|
|
self.assertEqual('aBc', cistr('ABC'))
|
|
|
|
self.assertEqual(str(cistr('ABC')), 'ABC')
|
|
|
|
|
|
|
|
d = {cistr('one'): 1, cistr('two'): 2, cistr('tHree'): 3}
|
|
|
|
self.assertEqual(d[cistr('one')], 1)
|
|
|
|
self.assertEqual(d[cistr('tWo')], 2)
|
|
|
|
self.assertEqual(d[cistr('THrEE')], 3)
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn(cistr('ONe'), d)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(d.get(cistr('thrEE')), 3)
|
|
|
|
|
|
|
|
def test_classic_comparisons(self):
|
|
|
|
# Testing classic comparisons...
|
|
|
|
class classic:
|
|
|
|
pass
|
|
|
|
|
|
|
|
for base in (classic, int, object):
|
|
|
|
class C(base):
|
|
|
|
def __init__(self, value):
|
|
|
|
self.value = int(value)
|
|
|
|
def __eq__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value == other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value == other
|
|
|
|
return NotImplemented
|
|
|
|
def __ne__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value != other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value != other
|
|
|
|
return NotImplemented
|
|
|
|
def __lt__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value < other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value < other
|
|
|
|
return NotImplemented
|
|
|
|
def __le__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value <= other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value <= other
|
|
|
|
return NotImplemented
|
|
|
|
def __gt__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value > other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value > other
|
|
|
|
return NotImplemented
|
|
|
|
def __ge__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value >= other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value >= other
|
|
|
|
return NotImplemented
|
|
|
|
|
|
|
|
c1 = C(1)
|
|
|
|
c2 = C(2)
|
|
|
|
c3 = C(3)
|
|
|
|
self.assertEqual(c1, 1)
|
|
|
|
c = {1: c1, 2: c2, 3: c3}
|
|
|
|
for x in 1, 2, 3:
|
|
|
|
for y in 1, 2, 3:
|
|
|
|
for op in "<", "<=", "==", "!=", ">", ">=":
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertEqual(eval("c[x] %s c[y]" % op),
|
2009-01-27 14:17:45 -04:00
|
|
|
eval("x %s y" % op),
|
|
|
|
"x=%d, y=%d" % (x, y))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertEqual(eval("c[x] %s y" % op),
|
2009-01-27 14:17:45 -04:00
|
|
|
eval("x %s y" % op),
|
|
|
|
"x=%d, y=%d" % (x, y))
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertEqual(eval("x %s c[y]" % op),
|
2009-01-27 14:17:45 -04:00
|
|
|
eval("x %s y" % op),
|
|
|
|
"x=%d, y=%d" % (x, y))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_rich_comparisons(self):
|
|
|
|
# Testing rich comparisons...
|
|
|
|
class Z(complex):
|
|
|
|
pass
|
|
|
|
z = Z(1)
|
|
|
|
self.assertEqual(z, 1+0j)
|
|
|
|
self.assertEqual(1+0j, z)
|
|
|
|
class ZZ(complex):
|
|
|
|
def __eq__(self, other):
|
|
|
|
try:
|
|
|
|
return abs(self - other) <= 1e-6
|
|
|
|
except:
|
|
|
|
return NotImplemented
|
|
|
|
zz = ZZ(1.0000003)
|
|
|
|
self.assertEqual(zz, 1+0j)
|
|
|
|
self.assertEqual(1+0j, zz)
|
|
|
|
|
|
|
|
class classic:
|
|
|
|
pass
|
|
|
|
for base in (classic, int, object, list):
|
|
|
|
class C(base):
|
|
|
|
def __init__(self, value):
|
|
|
|
self.value = int(value)
|
|
|
|
def __cmp__(self_, other):
|
|
|
|
self.fail("shouldn't call __cmp__")
|
|
|
|
def __eq__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value == other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value == other
|
|
|
|
return NotImplemented
|
|
|
|
def __ne__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value != other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value != other
|
|
|
|
return NotImplemented
|
|
|
|
def __lt__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value < other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value < other
|
|
|
|
return NotImplemented
|
|
|
|
def __le__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value <= other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value <= other
|
|
|
|
return NotImplemented
|
|
|
|
def __gt__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value > other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value > other
|
|
|
|
return NotImplemented
|
|
|
|
def __ge__(self, other):
|
|
|
|
if isinstance(other, C):
|
|
|
|
return self.value >= other.value
|
|
|
|
if isinstance(other, int) or isinstance(other, int):
|
|
|
|
return self.value >= other
|
|
|
|
return NotImplemented
|
|
|
|
c1 = C(1)
|
|
|
|
c2 = C(2)
|
|
|
|
c3 = C(3)
|
|
|
|
self.assertEqual(c1, 1)
|
|
|
|
c = {1: c1, 2: c2, 3: c3}
|
|
|
|
for x in 1, 2, 3:
|
|
|
|
for y in 1, 2, 3:
|
|
|
|
for op in "<", "<=", "==", "!=", ">", ">=":
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertEqual(eval("c[x] %s c[y]" % op),
|
|
|
|
eval("x %s y" % op),
|
|
|
|
"x=%d, y=%d" % (x, y))
|
|
|
|
self.assertEqual(eval("c[x] %s y" % op),
|
|
|
|
eval("x %s y" % op),
|
|
|
|
"x=%d, y=%d" % (x, y))
|
|
|
|
self.assertEqual(eval("x %s c[y]" % op),
|
|
|
|
eval("x %s y" % op),
|
|
|
|
"x=%d, y=%d" % (x, y))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_descrdoc(self):
|
|
|
|
# Testing descriptor doc strings...
|
merge the io-c branch: C implementation of the io module
The main io module now uses the C implementation. The Python one still exists
in Lib/_pyio.py for ease of testing new features and usefulness to other
implementers.
The rewrite was done by Antoine Pitrou and Amaury Forgeot d'Arc. I was slightly
helpful at the end. :)
Following are the log messages from the io-c branch:
Merged revisions 68683-68685,68687-68689,68693,68704,68741-68743,68745,68747,68752-68754,68756,68758,68812,68816-68817,68820-68822,68824-68825,68828,68876-68877,69037,69044,69104,69115,69194,69626-69629,69636,69638,69641-69642,69644-69654,69656-69661,69671,69677,69812-69815,69817,69827-69830,69839,69841-69845,69848,69850,69852,69854,69860,69865-69866,69868,69872-69873,69885,69888,69891-69893,69911,69913-69916,69963,70033,70035,70038,70041-70048,70067-70070,70075,70112,70133,70135,70140 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/io-c
........
r68683 | antoine.pitrou | 2009-01-17 17:13:48 -0600 (Sat, 17 Jan 2009) | 3 lines
Merge in changes from the io-c sandbox. Tests will follow in separate commits.
........
r68684 | antoine.pitrou | 2009-01-17 17:17:26 -0600 (Sat, 17 Jan 2009) | 3 lines
Fixes and additions to test_io.py
........
r68685 | antoine.pitrou | 2009-01-17 17:22:04 -0600 (Sat, 17 Jan 2009) | 1 line
Fix test_fileio
........
r68687 | antoine.pitrou | 2009-01-17 17:35:11 -0600 (Sat, 17 Jan 2009) | 3 lines
Add dependency to _iomodule.h for the various C sources
........
r68688 | antoine.pitrou | 2009-01-17 17:38:18 -0600 (Sat, 17 Jan 2009) | 3 lines
These precautions are not needed anymore!
........
r68689 | antoine.pitrou | 2009-01-17 17:41:48 -0600 (Sat, 17 Jan 2009) | 3 lines
Fix another test
........
r68693 | antoine.pitrou | 2009-01-17 17:49:58 -0600 (Sat, 17 Jan 2009) | 3 lines
Fix test_uu (which was using private attributes of TextIOWrapper)
........
r68704 | antoine.pitrou | 2009-01-17 18:45:29 -0600 (Sat, 17 Jan 2009) | 3 lines
Most io sources are Py_ssize_t-clean (I don't know about bytesio and stringio)
........
r68741 | antoine.pitrou | 2009-01-18 15:20:30 -0600 (Sun, 18 Jan 2009) | 3 lines
Check return type in TextIOWrapper.__next__
........
r68742 | antoine.pitrou | 2009-01-18 15:28:48 -0600 (Sun, 18 Jan 2009) | 4 lines
Make binary buffered readline and iteration much faster
(8x as fast as the IOBase generic implementation)
........
r68743 | antoine.pitrou | 2009-01-18 15:47:47 -0600 (Sun, 18 Jan 2009) | 3 lines
Reinsert test_io_after_close (was removed by mistake)
........
r68745 | antoine.pitrou | 2009-01-18 16:16:06 -0600 (Sun, 18 Jan 2009) | 3 lines
Add read, read1 and write methods to BufferedIOBase
........
r68747 | antoine.pitrou | 2009-01-18 16:35:58 -0600 (Sun, 18 Jan 2009) | 3 lines
Kill test failure
........
r68752 | amaury.forgeotdarc | 2009-01-18 17:05:43 -0600 (Sun, 18 Jan 2009) | 3 lines
Fix a segfault when e.g a BufferedReader is created with a FileIO in
read mode.
........
r68753 | antoine.pitrou | 2009-01-18 17:13:09 -0600 (Sun, 18 Jan 2009) | 3 lines
Add truncate() to text IO objects
........
r68754 | antoine.pitrou | 2009-01-18 17:51:08 -0600 (Sun, 18 Jan 2009) | 3 lines
Remove IOBase.__del__ and replace it with custom code with tp_dealloc
........
r68756 | antoine.pitrou | 2009-01-18 18:10:16 -0600 (Sun, 18 Jan 2009) | 3 lines
Remove irrelevant comment.
........
r68758 | antoine.pitrou | 2009-01-18 18:36:16 -0600 (Sun, 18 Jan 2009) | 3 lines
in importlib:_fileio._FileIO -> _io.FileIO
........
r68812 | antoine.pitrou | 2009-01-20 14:15:51 -0600 (Tue, 20 Jan 2009) | 3 lines
Add garbage collection support to FileIO objects
........
r68816 | antoine.pitrou | 2009-01-20 14:56:28 -0600 (Tue, 20 Jan 2009) | 3 lines
Add GC support to Buffered and Text IO objects
........
r68817 | antoine.pitrou | 2009-01-20 15:19:45 -0600 (Tue, 20 Jan 2009) | 3 lines
Add some file headers
........
r68820 | antoine.pitrou | 2009-01-20 15:29:59 -0600 (Tue, 20 Jan 2009) | 3 lines
Add class TextIOBase
........
r68821 | antoine.pitrou | 2009-01-20 15:36:16 -0600 (Tue, 20 Jan 2009) | 3 lines
Add properties to TextIOBase
........
r68822 | antoine.pitrou | 2009-01-20 15:41:19 -0600 (Tue, 20 Jan 2009) | 3 lines
Disable the pure Python TextIOBase class, and inject C the implementation instead
........
r68824 | antoine.pitrou | 2009-01-20 16:36:28 -0600 (Tue, 20 Jan 2009) | 3 lines
Fix two leaks
........
r68825 | antoine.pitrou | 2009-01-20 16:38:29 -0600 (Tue, 20 Jan 2009) | 3 lines
FileIO.name is just a plain attribute, we can set it directly
........
r68828 | antoine.pitrou | 2009-01-20 17:06:33 -0600 (Tue, 20 Jan 2009) | 3 lines
Speed up closed checks on text IO objects. Good for a 25% speedup on small ops.
........
r68876 | antoine.pitrou | 2009-01-23 17:01:25 -0600 (Fri, 23 Jan 2009) | 3 lines
Two typos
........
r68877 | antoine.pitrou | 2009-01-23 18:13:20 -0600 (Fri, 23 Jan 2009) | 3 lines
Remove two unused functions
........
r69037 | amaury.forgeotdarc | 2009-01-27 17:10:25 -0600 (Tue, 27 Jan 2009) | 2 lines
Update the win32 project files
........
r69044 | antoine.pitrou | 2009-01-27 18:51:07 -0600 (Tue, 27 Jan 2009) | 3 lines
Improve heuristic in IncrementalNewlineDecoder + some micro-optimizations
........
r69104 | antoine.pitrou | 2009-01-29 15:23:42 -0600 (Thu, 29 Jan 2009) | 3 lines
Fix some crashers found by Victor
........
r69115 | hirokazu.yamamoto | 2009-01-29 20:36:28 -0600 (Thu, 29 Jan 2009) | 1 line
Updated VC6 project file.
........
r69194 | antoine.pitrou | 2009-02-01 16:57:18 -0600 (Sun, 01 Feb 2009) | 3 lines
Fix downcasting warnings in 32-bit mode with 64-bit offsets (Windows)
........
r69626 | benjamin.peterson | 2009-02-14 17:33:34 -0600 (Sat, 14 Feb 2009) | 1 line
only catch AttributeError and UnsupportedOperation
........
r69627 | benjamin.peterson | 2009-02-14 21:35:28 -0600 (Sat, 14 Feb 2009) | 1 line
give the IO module its own state and store the os and locale modules in it
........
r69628 | benjamin.peterson | 2009-02-14 22:08:32 -0600 (Sat, 14 Feb 2009) | 1 line
put interned strings in the module state structure
........
r69629 | benjamin.peterson | 2009-02-14 22:15:29 -0600 (Sat, 14 Feb 2009) | 1 line
put UnsupportedOperation in the module state
........
r69636 | benjamin.peterson | 2009-02-15 08:31:42 -0600 (Sun, 15 Feb 2009) | 1 line
dealloc unsupported_operation
........
r69638 | benjamin.peterson | 2009-02-15 09:24:45 -0600 (Sun, 15 Feb 2009) | 1 line
actually test the C implementation
........
r69641 | benjamin.peterson | 2009-02-15 10:12:37 -0600 (Sun, 15 Feb 2009) | 5 lines
make interned strings globals again ;(
putting them in the module state was asking for trouble when the module
was dealloced before the classes in it were
........
r69642 | benjamin.peterson | 2009-02-15 10:19:45 -0600 (Sun, 15 Feb 2009) | 1 line
actually test the python implementations
........
r69644 | antoine.pitrou | 2009-02-15 11:59:30 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix memory leak in destructor when a Python class inherits from IOBase (or an IOBase-derived type)
........
r69645 | antoine.pitrou | 2009-02-15 12:23:26 -0600 (Sun, 15 Feb 2009) | 3 lines
Add a warning about the embarassing state of IOBase finalization
........
r69646 | antoine.pitrou | 2009-02-15 13:14:42 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix opening of 8-bit filenames with FileIO
........
r69647 | antoine.pitrou | 2009-02-15 13:20:22 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix leak in FileIO constructor
........
r69648 | antoine.pitrou | 2009-02-15 13:58:16 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix some refleaks
........
r69649 | antoine.pitrou | 2009-02-15 14:05:13 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix a leak in IOBase.writelines
........
r69650 | antoine.pitrou | 2009-02-15 14:11:56 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix memory leak in BufferedWriter.truncate
........
r69651 | antoine.pitrou | 2009-02-15 14:25:34 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix a leak in TextIOWrapper.seek
........
r69652 | antoine.pitrou | 2009-02-15 14:26:28 -0600 (Sun, 15 Feb 2009) | 3 lines
Unify implementations of truncate for buffered objects
........
r69653 | antoine.pitrou | 2009-02-15 15:15:15 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix more leaks in TextIOWrapper
........
r69654 | antoine.pitrou | 2009-02-15 15:21:57 -0600 (Sun, 15 Feb 2009) | 3 lines
Smaller chunk size for a faster test
........
r69656 | benjamin.peterson | 2009-02-15 17:29:48 -0600 (Sun, 15 Feb 2009) | 1 line
braces make this much clearer
........
r69657 | benjamin.peterson | 2009-02-15 17:46:07 -0600 (Sun, 15 Feb 2009) | 1 line
use the correct macro
........
r69658 | antoine.pitrou | 2009-02-15 19:38:59 -0600 (Sun, 15 Feb 2009) | 5 lines
Fix crash in test_urllib2_localnet in debug mode. It was due to an HTTPResponse
object being revived when calling its close() method in IOBase's tp_dealloc.
_PyIOBase_finalize() starts looking scary...
........
r69659 | benjamin.peterson | 2009-02-15 20:55:48 -0600 (Sun, 15 Feb 2009) | 1 line
fix segfault on initialization failing
........
r69660 | benjamin.peterson | 2009-02-15 21:09:31 -0600 (Sun, 15 Feb 2009) | 1 line
apparently locale.getprefferedencoding() can raise a ImportError, too
........
r69661 | benjamin.peterson | 2009-02-15 21:54:15 -0600 (Sun, 15 Feb 2009) | 1 line
it's amazing this worked at all; I was using the wrong structs!
........
r69671 | benjamin.peterson | 2009-02-16 08:38:27 -0600 (Mon, 16 Feb 2009) | 1 line
add garbage collection support to bytesio
........
r69677 | benjamin.peterson | 2009-02-16 10:31:03 -0600 (Mon, 16 Feb 2009) | 5 lines
reduce ImportError catching code duplication
I'm not sure this makes the code clearer with its new gotos, but
at least I added a big fat comment
........
r69812 | antoine.pitrou | 2009-02-20 13:50:16 -0600 (Fri, 20 Feb 2009) | 3 lines
_StringIO now belongs to the _io modules, rather to its own _stringio module
........
r69813 | antoine.pitrou | 2009-02-20 13:58:22 -0600 (Fri, 20 Feb 2009) | 3 lines
Add a test for StringIO properties
........
r69814 | antoine.pitrou | 2009-02-20 14:06:03 -0600 (Fri, 20 Feb 2009) | 3 lines
Reimplement a few trivial StringIO functions and properties in C
........
r69815 | antoine.pitrou | 2009-02-20 14:13:11 -0600 (Fri, 20 Feb 2009) | 3 lines
Add the line_buffering property to TextIOWrapper, and test for it
........
r69817 | antoine.pitrou | 2009-02-20 14:45:50 -0600 (Fri, 20 Feb 2009) | 4 lines
Allow IncrementalNewlineDecoder to take unicode objects as decoding input if the decoder parameter is None
This will help rewriting StringIO to C
........
r69827 | antoine.pitrou | 2009-02-20 19:00:30 -0600 (Fri, 20 Feb 2009) | 3 lines
Rewrite most of StringIO in C. Some almost empty stubs remain to be converted.
........
r69828 | antoine.pitrou | 2009-02-20 19:09:25 -0600 (Fri, 20 Feb 2009) | 3 lines
Plug a leak, and remove an unused string
........
r69829 | benjamin.peterson | 2009-02-20 20:02:28 -0600 (Fri, 20 Feb 2009) | 1 line
this assertions makes more sense here
........
r69830 | benjamin.peterson | 2009-02-20 20:03:04 -0600 (Fri, 20 Feb 2009) | 1 line
PyModule_AddObject can fail; simplify this code with a macro
........
r69839 | antoine.pitrou | 2009-02-21 12:54:01 -0600 (Sat, 21 Feb 2009) | 3 lines
StringIO is now written entirely in C (and blazingly fast)
........
r69841 | benjamin.peterson | 2009-02-21 14:05:40 -0600 (Sat, 21 Feb 2009) | 1 line
split the Python implementation of io into another module and rewrite the tests to test both implementations
........
r69842 | benjamin.peterson | 2009-02-21 14:10:00 -0600 (Sat, 21 Feb 2009) | 1 line
closed is not a function
........
r69843 | benjamin.peterson | 2009-02-21 14:13:04 -0600 (Sat, 21 Feb 2009) | 1 line
fix __all__ test
........
r69844 | benjamin.peterson | 2009-02-21 14:21:24 -0600 (Sat, 21 Feb 2009) | 1 line
fix the rest of the Misc tests
........
r69845 | benjamin.peterson | 2009-02-21 14:26:59 -0600 (Sat, 21 Feb 2009) | 1 line
RawIOBase is better for FileIO
........
r69848 | benjamin.peterson | 2009-02-21 15:33:53 -0600 (Sat, 21 Feb 2009) | 1 line
fix some more tests broken by bag argument validation
........
r69850 | benjamin.peterson | 2009-02-21 16:16:42 -0600 (Sat, 21 Feb 2009) | 1 line
make the python IncrementalNewineDecoder support a None decoder
........
r69852 | benjamin.peterson | 2009-02-21 16:36:09 -0600 (Sat, 21 Feb 2009) | 1 line
fix a BlockingIOError.characters_written bug
........
r69854 | benjamin.peterson | 2009-02-21 16:49:02 -0600 (Sat, 21 Feb 2009) | 1 line
check whence
........
r69860 | benjamin.peterson | 2009-02-21 17:42:50 -0600 (Sat, 21 Feb 2009) | 1 line
fix some of these Misbehaving io tests
........
r69865 | benjamin.peterson | 2009-02-21 18:59:52 -0600 (Sat, 21 Feb 2009) | 1 line
don't use super here()
........
r69866 | benjamin.peterson | 2009-02-21 19:05:28 -0600 (Sat, 21 Feb 2009) | 1 line
use implementation specific classes
........
r69868 | benjamin.peterson | 2009-02-21 22:12:05 -0600 (Sat, 21 Feb 2009) | 1 line
use a more DRY friendly approach to injecting module contents into test classes
........
r69872 | antoine.pitrou | 2009-02-22 13:39:45 -0600 (Sun, 22 Feb 2009) | 3 lines
Sanitize destructor behaviour of IOBase. Now Python-defined attributes can be accessed from close().
........
r69873 | antoine.pitrou | 2009-02-22 13:50:14 -0600 (Sun, 22 Feb 2009) | 4 lines
Only set the internal fd after it has been checked to be valid
(otherwise, the destructor will attempt to close it)
........
r69885 | benjamin.peterson | 2009-02-22 15:30:14 -0600 (Sun, 22 Feb 2009) | 1 line
convert some other tests to use both io implementations
........
r69888 | antoine.pitrou | 2009-02-22 17:03:16 -0600 (Sun, 22 Feb 2009) | 3 lines
Silence all exceptions when finalizing
........
r69891 | benjamin.peterson | 2009-02-22 17:27:24 -0600 (Sun, 22 Feb 2009) | 1 line
convert another test to test both io implementations
........
r69892 | benjamin.peterson | 2009-02-22 17:32:15 -0600 (Sun, 22 Feb 2009) | 1 line
help poor people like me to find their io tests (did I miss any?)
........
r69893 | benjamin.peterson | 2009-02-22 17:37:56 -0600 (Sun, 22 Feb 2009) | 1 line
put a big note in the test telling people to write tests for both implementations now
........
r69911 | antoine.pitrou | 2009-02-23 13:57:18 -0600 (Mon, 23 Feb 2009) | 3 lines
expose DEFAULT_BUFFER_SIZE again (fixes a bunch of test failures)
........
r69913 | antoine.pitrou | 2009-02-23 14:10:30 -0600 (Mon, 23 Feb 2009) | 4 lines
Do the cyclic garbage collection tests only on the C version.
The Python version is helpless as it uses __del__.
........
r69914 | antoine.pitrou | 2009-02-23 14:21:41 -0600 (Mon, 23 Feb 2009) | 3 lines
Adapt test_largefile to test both implementations
........
r69915 | antoine.pitrou | 2009-02-23 14:25:14 -0600 (Mon, 23 Feb 2009) | 3 lines
One small failure
........
r69916 | antoine.pitrou | 2009-02-23 14:28:33 -0600 (Mon, 23 Feb 2009) | 3 lines
Add a comment, at BP's request
........
r69963 | antoine.pitrou | 2009-02-25 09:42:59 -0600 (Wed, 25 Feb 2009) | 3 lines
Add a test of ABC inheritance
........
r70033 | antoine.pitrou | 2009-02-27 15:49:50 -0600 (Fri, 27 Feb 2009) | 3 lines
The base classes now are ABCs.
........
r70035 | benjamin.peterson | 2009-02-27 15:57:41 -0600 (Fri, 27 Feb 2009) | 1 line
good house keeping
........
r70038 | antoine.pitrou | 2009-02-27 17:05:23 -0600 (Fri, 27 Feb 2009) | 4 lines
Make the buffer allocation overflow tests specific to the C implementation, since the Python implementation resizes its buffers when needed rather than allocating them up front.
........
r70041 | benjamin.peterson | 2009-02-27 18:26:12 -0600 (Fri, 27 Feb 2009) | 1 line
kill java naming for sanity
........
r70042 | benjamin.peterson | 2009-02-27 18:28:53 -0600 (Fri, 27 Feb 2009) | 2 lines
timingTest is superseded by iobench
........
r70043 | antoine.pitrou | 2009-02-27 19:13:50 -0600 (Fri, 27 Feb 2009) | 3 lines
Remove the last traces of java naming in test_io
........
r70044 | antoine.pitrou | 2009-02-27 19:18:34 -0600 (Fri, 27 Feb 2009) | 3 lines
Better resource cleanup
........
r70045 | antoine.pitrou | 2009-02-27 19:29:00 -0600 (Fri, 27 Feb 2009) | 3 lines
Remove dubious uses of super(), and fix one test
........
r70046 | antoine.pitrou | 2009-02-27 19:31:00 -0600 (Fri, 27 Feb 2009) | 3 lines
Bump up CHUNK_SIZE (no need to make the Python version look slower than it is)
........
r70047 | benjamin.peterson | 2009-02-27 20:03:26 -0600 (Fri, 27 Feb 2009) | 1 line
fix typo
........
r70048 | benjamin.peterson | 2009-02-27 21:35:11 -0600 (Fri, 27 Feb 2009) | 1 line
move code to a better place
........
r70067 | benjamin.peterson | 2009-02-28 10:43:20 -0600 (Sat, 28 Feb 2009) | 4 lines
1. make sure to undo buffered read aheads in BufferedRandom.seek()
2. refill the buffer if have <= 0
3. fix the last failing test_io test!
........
r70068 | benjamin.peterson | 2009-02-28 10:57:50 -0600 (Sat, 28 Feb 2009) | 1 line
define read1() on the python implementation's BufferedIOBase
........
r70069 | benjamin.peterson | 2009-02-28 11:01:17 -0600 (Sat, 28 Feb 2009) | 1 line
document read1() in BufferedIOBase
........
r70070 | benjamin.peterson | 2009-02-28 11:06:42 -0600 (Sat, 28 Feb 2009) | 1 line
give credit where credit is due
........
r70075 | antoine.pitrou | 2009-02-28 13:34:59 -0600 (Sat, 28 Feb 2009) | 3 lines
Amaury's name
........
r70112 | antoine.pitrou | 2009-03-02 17:11:55 -0600 (Mon, 02 Mar 2009) | 4 lines
Looks like this is necessary in order to build cleanly under Windows
(someone correct this if it's wrong, I'm no Windows user)
........
r70133 | benjamin.peterson | 2009-03-03 15:23:32 -0600 (Tue, 03 Mar 2009) | 1 line
fix test_newline_property on _pyio.StringIO
........
r70135 | benjamin.peterson | 2009-03-03 15:47:30 -0600 (Tue, 03 Mar 2009) | 1 line
fix typos and inconsistencies. thanks to Daniel Diniz
........
r70140 | benjamin.peterson | 2009-03-03 16:21:10 -0600 (Tue, 03 Mar 2009) | 1 line
add the test from #5266
........
2009-03-03 20:14:51 -04:00
|
|
|
from _io import FileIO
|
2008-02-05 14:13:15 -04:00
|
|
|
def check(descr, what):
|
|
|
|
self.assertEqual(descr.__doc__, what)
|
merge the io-c branch: C implementation of the io module
The main io module now uses the C implementation. The Python one still exists
in Lib/_pyio.py for ease of testing new features and usefulness to other
implementers.
The rewrite was done by Antoine Pitrou and Amaury Forgeot d'Arc. I was slightly
helpful at the end. :)
Following are the log messages from the io-c branch:
Merged revisions 68683-68685,68687-68689,68693,68704,68741-68743,68745,68747,68752-68754,68756,68758,68812,68816-68817,68820-68822,68824-68825,68828,68876-68877,69037,69044,69104,69115,69194,69626-69629,69636,69638,69641-69642,69644-69654,69656-69661,69671,69677,69812-69815,69817,69827-69830,69839,69841-69845,69848,69850,69852,69854,69860,69865-69866,69868,69872-69873,69885,69888,69891-69893,69911,69913-69916,69963,70033,70035,70038,70041-70048,70067-70070,70075,70112,70133,70135,70140 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/io-c
........
r68683 | antoine.pitrou | 2009-01-17 17:13:48 -0600 (Sat, 17 Jan 2009) | 3 lines
Merge in changes from the io-c sandbox. Tests will follow in separate commits.
........
r68684 | antoine.pitrou | 2009-01-17 17:17:26 -0600 (Sat, 17 Jan 2009) | 3 lines
Fixes and additions to test_io.py
........
r68685 | antoine.pitrou | 2009-01-17 17:22:04 -0600 (Sat, 17 Jan 2009) | 1 line
Fix test_fileio
........
r68687 | antoine.pitrou | 2009-01-17 17:35:11 -0600 (Sat, 17 Jan 2009) | 3 lines
Add dependency to _iomodule.h for the various C sources
........
r68688 | antoine.pitrou | 2009-01-17 17:38:18 -0600 (Sat, 17 Jan 2009) | 3 lines
These precautions are not needed anymore!
........
r68689 | antoine.pitrou | 2009-01-17 17:41:48 -0600 (Sat, 17 Jan 2009) | 3 lines
Fix another test
........
r68693 | antoine.pitrou | 2009-01-17 17:49:58 -0600 (Sat, 17 Jan 2009) | 3 lines
Fix test_uu (which was using private attributes of TextIOWrapper)
........
r68704 | antoine.pitrou | 2009-01-17 18:45:29 -0600 (Sat, 17 Jan 2009) | 3 lines
Most io sources are Py_ssize_t-clean (I don't know about bytesio and stringio)
........
r68741 | antoine.pitrou | 2009-01-18 15:20:30 -0600 (Sun, 18 Jan 2009) | 3 lines
Check return type in TextIOWrapper.__next__
........
r68742 | antoine.pitrou | 2009-01-18 15:28:48 -0600 (Sun, 18 Jan 2009) | 4 lines
Make binary buffered readline and iteration much faster
(8x as fast as the IOBase generic implementation)
........
r68743 | antoine.pitrou | 2009-01-18 15:47:47 -0600 (Sun, 18 Jan 2009) | 3 lines
Reinsert test_io_after_close (was removed by mistake)
........
r68745 | antoine.pitrou | 2009-01-18 16:16:06 -0600 (Sun, 18 Jan 2009) | 3 lines
Add read, read1 and write methods to BufferedIOBase
........
r68747 | antoine.pitrou | 2009-01-18 16:35:58 -0600 (Sun, 18 Jan 2009) | 3 lines
Kill test failure
........
r68752 | amaury.forgeotdarc | 2009-01-18 17:05:43 -0600 (Sun, 18 Jan 2009) | 3 lines
Fix a segfault when e.g a BufferedReader is created with a FileIO in
read mode.
........
r68753 | antoine.pitrou | 2009-01-18 17:13:09 -0600 (Sun, 18 Jan 2009) | 3 lines
Add truncate() to text IO objects
........
r68754 | antoine.pitrou | 2009-01-18 17:51:08 -0600 (Sun, 18 Jan 2009) | 3 lines
Remove IOBase.__del__ and replace it with custom code with tp_dealloc
........
r68756 | antoine.pitrou | 2009-01-18 18:10:16 -0600 (Sun, 18 Jan 2009) | 3 lines
Remove irrelevant comment.
........
r68758 | antoine.pitrou | 2009-01-18 18:36:16 -0600 (Sun, 18 Jan 2009) | 3 lines
in importlib:_fileio._FileIO -> _io.FileIO
........
r68812 | antoine.pitrou | 2009-01-20 14:15:51 -0600 (Tue, 20 Jan 2009) | 3 lines
Add garbage collection support to FileIO objects
........
r68816 | antoine.pitrou | 2009-01-20 14:56:28 -0600 (Tue, 20 Jan 2009) | 3 lines
Add GC support to Buffered and Text IO objects
........
r68817 | antoine.pitrou | 2009-01-20 15:19:45 -0600 (Tue, 20 Jan 2009) | 3 lines
Add some file headers
........
r68820 | antoine.pitrou | 2009-01-20 15:29:59 -0600 (Tue, 20 Jan 2009) | 3 lines
Add class TextIOBase
........
r68821 | antoine.pitrou | 2009-01-20 15:36:16 -0600 (Tue, 20 Jan 2009) | 3 lines
Add properties to TextIOBase
........
r68822 | antoine.pitrou | 2009-01-20 15:41:19 -0600 (Tue, 20 Jan 2009) | 3 lines
Disable the pure Python TextIOBase class, and inject C the implementation instead
........
r68824 | antoine.pitrou | 2009-01-20 16:36:28 -0600 (Tue, 20 Jan 2009) | 3 lines
Fix two leaks
........
r68825 | antoine.pitrou | 2009-01-20 16:38:29 -0600 (Tue, 20 Jan 2009) | 3 lines
FileIO.name is just a plain attribute, we can set it directly
........
r68828 | antoine.pitrou | 2009-01-20 17:06:33 -0600 (Tue, 20 Jan 2009) | 3 lines
Speed up closed checks on text IO objects. Good for a 25% speedup on small ops.
........
r68876 | antoine.pitrou | 2009-01-23 17:01:25 -0600 (Fri, 23 Jan 2009) | 3 lines
Two typos
........
r68877 | antoine.pitrou | 2009-01-23 18:13:20 -0600 (Fri, 23 Jan 2009) | 3 lines
Remove two unused functions
........
r69037 | amaury.forgeotdarc | 2009-01-27 17:10:25 -0600 (Tue, 27 Jan 2009) | 2 lines
Update the win32 project files
........
r69044 | antoine.pitrou | 2009-01-27 18:51:07 -0600 (Tue, 27 Jan 2009) | 3 lines
Improve heuristic in IncrementalNewlineDecoder + some micro-optimizations
........
r69104 | antoine.pitrou | 2009-01-29 15:23:42 -0600 (Thu, 29 Jan 2009) | 3 lines
Fix some crashers found by Victor
........
r69115 | hirokazu.yamamoto | 2009-01-29 20:36:28 -0600 (Thu, 29 Jan 2009) | 1 line
Updated VC6 project file.
........
r69194 | antoine.pitrou | 2009-02-01 16:57:18 -0600 (Sun, 01 Feb 2009) | 3 lines
Fix downcasting warnings in 32-bit mode with 64-bit offsets (Windows)
........
r69626 | benjamin.peterson | 2009-02-14 17:33:34 -0600 (Sat, 14 Feb 2009) | 1 line
only catch AttributeError and UnsupportedOperation
........
r69627 | benjamin.peterson | 2009-02-14 21:35:28 -0600 (Sat, 14 Feb 2009) | 1 line
give the IO module its own state and store the os and locale modules in it
........
r69628 | benjamin.peterson | 2009-02-14 22:08:32 -0600 (Sat, 14 Feb 2009) | 1 line
put interned strings in the module state structure
........
r69629 | benjamin.peterson | 2009-02-14 22:15:29 -0600 (Sat, 14 Feb 2009) | 1 line
put UnsupportedOperation in the module state
........
r69636 | benjamin.peterson | 2009-02-15 08:31:42 -0600 (Sun, 15 Feb 2009) | 1 line
dealloc unsupported_operation
........
r69638 | benjamin.peterson | 2009-02-15 09:24:45 -0600 (Sun, 15 Feb 2009) | 1 line
actually test the C implementation
........
r69641 | benjamin.peterson | 2009-02-15 10:12:37 -0600 (Sun, 15 Feb 2009) | 5 lines
make interned strings globals again ;(
putting them in the module state was asking for trouble when the module
was dealloced before the classes in it were
........
r69642 | benjamin.peterson | 2009-02-15 10:19:45 -0600 (Sun, 15 Feb 2009) | 1 line
actually test the python implementations
........
r69644 | antoine.pitrou | 2009-02-15 11:59:30 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix memory leak in destructor when a Python class inherits from IOBase (or an IOBase-derived type)
........
r69645 | antoine.pitrou | 2009-02-15 12:23:26 -0600 (Sun, 15 Feb 2009) | 3 lines
Add a warning about the embarassing state of IOBase finalization
........
r69646 | antoine.pitrou | 2009-02-15 13:14:42 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix opening of 8-bit filenames with FileIO
........
r69647 | antoine.pitrou | 2009-02-15 13:20:22 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix leak in FileIO constructor
........
r69648 | antoine.pitrou | 2009-02-15 13:58:16 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix some refleaks
........
r69649 | antoine.pitrou | 2009-02-15 14:05:13 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix a leak in IOBase.writelines
........
r69650 | antoine.pitrou | 2009-02-15 14:11:56 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix memory leak in BufferedWriter.truncate
........
r69651 | antoine.pitrou | 2009-02-15 14:25:34 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix a leak in TextIOWrapper.seek
........
r69652 | antoine.pitrou | 2009-02-15 14:26:28 -0600 (Sun, 15 Feb 2009) | 3 lines
Unify implementations of truncate for buffered objects
........
r69653 | antoine.pitrou | 2009-02-15 15:15:15 -0600 (Sun, 15 Feb 2009) | 3 lines
Fix more leaks in TextIOWrapper
........
r69654 | antoine.pitrou | 2009-02-15 15:21:57 -0600 (Sun, 15 Feb 2009) | 3 lines
Smaller chunk size for a faster test
........
r69656 | benjamin.peterson | 2009-02-15 17:29:48 -0600 (Sun, 15 Feb 2009) | 1 line
braces make this much clearer
........
r69657 | benjamin.peterson | 2009-02-15 17:46:07 -0600 (Sun, 15 Feb 2009) | 1 line
use the correct macro
........
r69658 | antoine.pitrou | 2009-02-15 19:38:59 -0600 (Sun, 15 Feb 2009) | 5 lines
Fix crash in test_urllib2_localnet in debug mode. It was due to an HTTPResponse
object being revived when calling its close() method in IOBase's tp_dealloc.
_PyIOBase_finalize() starts looking scary...
........
r69659 | benjamin.peterson | 2009-02-15 20:55:48 -0600 (Sun, 15 Feb 2009) | 1 line
fix segfault on initialization failing
........
r69660 | benjamin.peterson | 2009-02-15 21:09:31 -0600 (Sun, 15 Feb 2009) | 1 line
apparently locale.getprefferedencoding() can raise a ImportError, too
........
r69661 | benjamin.peterson | 2009-02-15 21:54:15 -0600 (Sun, 15 Feb 2009) | 1 line
it's amazing this worked at all; I was using the wrong structs!
........
r69671 | benjamin.peterson | 2009-02-16 08:38:27 -0600 (Mon, 16 Feb 2009) | 1 line
add garbage collection support to bytesio
........
r69677 | benjamin.peterson | 2009-02-16 10:31:03 -0600 (Mon, 16 Feb 2009) | 5 lines
reduce ImportError catching code duplication
I'm not sure this makes the code clearer with its new gotos, but
at least I added a big fat comment
........
r69812 | antoine.pitrou | 2009-02-20 13:50:16 -0600 (Fri, 20 Feb 2009) | 3 lines
_StringIO now belongs to the _io modules, rather to its own _stringio module
........
r69813 | antoine.pitrou | 2009-02-20 13:58:22 -0600 (Fri, 20 Feb 2009) | 3 lines
Add a test for StringIO properties
........
r69814 | antoine.pitrou | 2009-02-20 14:06:03 -0600 (Fri, 20 Feb 2009) | 3 lines
Reimplement a few trivial StringIO functions and properties in C
........
r69815 | antoine.pitrou | 2009-02-20 14:13:11 -0600 (Fri, 20 Feb 2009) | 3 lines
Add the line_buffering property to TextIOWrapper, and test for it
........
r69817 | antoine.pitrou | 2009-02-20 14:45:50 -0600 (Fri, 20 Feb 2009) | 4 lines
Allow IncrementalNewlineDecoder to take unicode objects as decoding input if the decoder parameter is None
This will help rewriting StringIO to C
........
r69827 | antoine.pitrou | 2009-02-20 19:00:30 -0600 (Fri, 20 Feb 2009) | 3 lines
Rewrite most of StringIO in C. Some almost empty stubs remain to be converted.
........
r69828 | antoine.pitrou | 2009-02-20 19:09:25 -0600 (Fri, 20 Feb 2009) | 3 lines
Plug a leak, and remove an unused string
........
r69829 | benjamin.peterson | 2009-02-20 20:02:28 -0600 (Fri, 20 Feb 2009) | 1 line
this assertions makes more sense here
........
r69830 | benjamin.peterson | 2009-02-20 20:03:04 -0600 (Fri, 20 Feb 2009) | 1 line
PyModule_AddObject can fail; simplify this code with a macro
........
r69839 | antoine.pitrou | 2009-02-21 12:54:01 -0600 (Sat, 21 Feb 2009) | 3 lines
StringIO is now written entirely in C (and blazingly fast)
........
r69841 | benjamin.peterson | 2009-02-21 14:05:40 -0600 (Sat, 21 Feb 2009) | 1 line
split the Python implementation of io into another module and rewrite the tests to test both implementations
........
r69842 | benjamin.peterson | 2009-02-21 14:10:00 -0600 (Sat, 21 Feb 2009) | 1 line
closed is not a function
........
r69843 | benjamin.peterson | 2009-02-21 14:13:04 -0600 (Sat, 21 Feb 2009) | 1 line
fix __all__ test
........
r69844 | benjamin.peterson | 2009-02-21 14:21:24 -0600 (Sat, 21 Feb 2009) | 1 line
fix the rest of the Misc tests
........
r69845 | benjamin.peterson | 2009-02-21 14:26:59 -0600 (Sat, 21 Feb 2009) | 1 line
RawIOBase is better for FileIO
........
r69848 | benjamin.peterson | 2009-02-21 15:33:53 -0600 (Sat, 21 Feb 2009) | 1 line
fix some more tests broken by bag argument validation
........
r69850 | benjamin.peterson | 2009-02-21 16:16:42 -0600 (Sat, 21 Feb 2009) | 1 line
make the python IncrementalNewineDecoder support a None decoder
........
r69852 | benjamin.peterson | 2009-02-21 16:36:09 -0600 (Sat, 21 Feb 2009) | 1 line
fix a BlockingIOError.characters_written bug
........
r69854 | benjamin.peterson | 2009-02-21 16:49:02 -0600 (Sat, 21 Feb 2009) | 1 line
check whence
........
r69860 | benjamin.peterson | 2009-02-21 17:42:50 -0600 (Sat, 21 Feb 2009) | 1 line
fix some of these Misbehaving io tests
........
r69865 | benjamin.peterson | 2009-02-21 18:59:52 -0600 (Sat, 21 Feb 2009) | 1 line
don't use super here()
........
r69866 | benjamin.peterson | 2009-02-21 19:05:28 -0600 (Sat, 21 Feb 2009) | 1 line
use implementation specific classes
........
r69868 | benjamin.peterson | 2009-02-21 22:12:05 -0600 (Sat, 21 Feb 2009) | 1 line
use a more DRY friendly approach to injecting module contents into test classes
........
r69872 | antoine.pitrou | 2009-02-22 13:39:45 -0600 (Sun, 22 Feb 2009) | 3 lines
Sanitize destructor behaviour of IOBase. Now Python-defined attributes can be accessed from close().
........
r69873 | antoine.pitrou | 2009-02-22 13:50:14 -0600 (Sun, 22 Feb 2009) | 4 lines
Only set the internal fd after it has been checked to be valid
(otherwise, the destructor will attempt to close it)
........
r69885 | benjamin.peterson | 2009-02-22 15:30:14 -0600 (Sun, 22 Feb 2009) | 1 line
convert some other tests to use both io implementations
........
r69888 | antoine.pitrou | 2009-02-22 17:03:16 -0600 (Sun, 22 Feb 2009) | 3 lines
Silence all exceptions when finalizing
........
r69891 | benjamin.peterson | 2009-02-22 17:27:24 -0600 (Sun, 22 Feb 2009) | 1 line
convert another test to test both io implementations
........
r69892 | benjamin.peterson | 2009-02-22 17:32:15 -0600 (Sun, 22 Feb 2009) | 1 line
help poor people like me to find their io tests (did I miss any?)
........
r69893 | benjamin.peterson | 2009-02-22 17:37:56 -0600 (Sun, 22 Feb 2009) | 1 line
put a big note in the test telling people to write tests for both implementations now
........
r69911 | antoine.pitrou | 2009-02-23 13:57:18 -0600 (Mon, 23 Feb 2009) | 3 lines
expose DEFAULT_BUFFER_SIZE again (fixes a bunch of test failures)
........
r69913 | antoine.pitrou | 2009-02-23 14:10:30 -0600 (Mon, 23 Feb 2009) | 4 lines
Do the cyclic garbage collection tests only on the C version.
The Python version is helpless as it uses __del__.
........
r69914 | antoine.pitrou | 2009-02-23 14:21:41 -0600 (Mon, 23 Feb 2009) | 3 lines
Adapt test_largefile to test both implementations
........
r69915 | antoine.pitrou | 2009-02-23 14:25:14 -0600 (Mon, 23 Feb 2009) | 3 lines
One small failure
........
r69916 | antoine.pitrou | 2009-02-23 14:28:33 -0600 (Mon, 23 Feb 2009) | 3 lines
Add a comment, at BP's request
........
r69963 | antoine.pitrou | 2009-02-25 09:42:59 -0600 (Wed, 25 Feb 2009) | 3 lines
Add a test of ABC inheritance
........
r70033 | antoine.pitrou | 2009-02-27 15:49:50 -0600 (Fri, 27 Feb 2009) | 3 lines
The base classes now are ABCs.
........
r70035 | benjamin.peterson | 2009-02-27 15:57:41 -0600 (Fri, 27 Feb 2009) | 1 line
good house keeping
........
r70038 | antoine.pitrou | 2009-02-27 17:05:23 -0600 (Fri, 27 Feb 2009) | 4 lines
Make the buffer allocation overflow tests specific to the C implementation, since the Python implementation resizes its buffers when needed rather than allocating them up front.
........
r70041 | benjamin.peterson | 2009-02-27 18:26:12 -0600 (Fri, 27 Feb 2009) | 1 line
kill java naming for sanity
........
r70042 | benjamin.peterson | 2009-02-27 18:28:53 -0600 (Fri, 27 Feb 2009) | 2 lines
timingTest is superseded by iobench
........
r70043 | antoine.pitrou | 2009-02-27 19:13:50 -0600 (Fri, 27 Feb 2009) | 3 lines
Remove the last traces of java naming in test_io
........
r70044 | antoine.pitrou | 2009-02-27 19:18:34 -0600 (Fri, 27 Feb 2009) | 3 lines
Better resource cleanup
........
r70045 | antoine.pitrou | 2009-02-27 19:29:00 -0600 (Fri, 27 Feb 2009) | 3 lines
Remove dubious uses of super(), and fix one test
........
r70046 | antoine.pitrou | 2009-02-27 19:31:00 -0600 (Fri, 27 Feb 2009) | 3 lines
Bump up CHUNK_SIZE (no need to make the Python version look slower than it is)
........
r70047 | benjamin.peterson | 2009-02-27 20:03:26 -0600 (Fri, 27 Feb 2009) | 1 line
fix typo
........
r70048 | benjamin.peterson | 2009-02-27 21:35:11 -0600 (Fri, 27 Feb 2009) | 1 line
move code to a better place
........
r70067 | benjamin.peterson | 2009-02-28 10:43:20 -0600 (Sat, 28 Feb 2009) | 4 lines
1. make sure to undo buffered read aheads in BufferedRandom.seek()
2. refill the buffer if have <= 0
3. fix the last failing test_io test!
........
r70068 | benjamin.peterson | 2009-02-28 10:57:50 -0600 (Sat, 28 Feb 2009) | 1 line
define read1() on the python implementation's BufferedIOBase
........
r70069 | benjamin.peterson | 2009-02-28 11:01:17 -0600 (Sat, 28 Feb 2009) | 1 line
document read1() in BufferedIOBase
........
r70070 | benjamin.peterson | 2009-02-28 11:06:42 -0600 (Sat, 28 Feb 2009) | 1 line
give credit where credit is due
........
r70075 | antoine.pitrou | 2009-02-28 13:34:59 -0600 (Sat, 28 Feb 2009) | 3 lines
Amaury's name
........
r70112 | antoine.pitrou | 2009-03-02 17:11:55 -0600 (Mon, 02 Mar 2009) | 4 lines
Looks like this is necessary in order to build cleanly under Windows
(someone correct this if it's wrong, I'm no Windows user)
........
r70133 | benjamin.peterson | 2009-03-03 15:23:32 -0600 (Tue, 03 Mar 2009) | 1 line
fix test_newline_property on _pyio.StringIO
........
r70135 | benjamin.peterson | 2009-03-03 15:47:30 -0600 (Tue, 03 Mar 2009) | 1 line
fix typos and inconsistencies. thanks to Daniel Diniz
........
r70140 | benjamin.peterson | 2009-03-03 16:21:10 -0600 (Tue, 03 Mar 2009) | 1 line
add the test from #5266
........
2009-03-03 20:14:51 -04:00
|
|
|
check(FileIO.closed, "True if the file is closed") # getset descriptor
|
2008-02-05 14:13:15 -04:00
|
|
|
check(complex.real, "the real part of a complex number") # member descriptor
|
|
|
|
|
|
|
|
def test_doc_descriptor(self):
|
|
|
|
# Testing __doc__ descriptor...
|
|
|
|
# SF bug 542984
|
|
|
|
class DocDescr(object):
|
|
|
|
def __get__(self, object, otype):
|
|
|
|
if object:
|
|
|
|
object = object.__class__.__name__ + ' instance'
|
|
|
|
if otype:
|
|
|
|
otype = otype.__name__
|
|
|
|
return 'object=%s; type=%s' % (object, otype)
|
2022-11-13 14:30:00 -04:00
|
|
|
class NewClass:
|
2008-02-05 14:13:15 -04:00
|
|
|
__doc__ = DocDescr()
|
|
|
|
self.assertEqual(NewClass.__doc__, 'object=None; type=NewClass')
|
|
|
|
self.assertEqual(NewClass().__doc__, 'object=NewClass instance; type=NewClass')
|
|
|
|
|
|
|
|
def test_set_class(self):
|
|
|
|
# Testing __class__ assignment...
|
|
|
|
class C(object): pass
|
|
|
|
class D(object): pass
|
|
|
|
class E(object): pass
|
|
|
|
class F(D, E): pass
|
|
|
|
for cls in C, D, E, F:
|
|
|
|
for cls2 in C, D, E, F:
|
|
|
|
x = cls()
|
|
|
|
x.__class__ = cls2
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(x.__class__, cls2)
|
2008-02-05 14:13:15 -04:00
|
|
|
x.__class__ = cls
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(x.__class__, cls)
|
2008-02-05 14:13:15 -04:00
|
|
|
def cant(x, C):
|
|
|
|
try:
|
|
|
|
x.__class__ = C
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow %r.__class__ = %r" % (x, C))
|
|
|
|
try:
|
|
|
|
delattr(x, "__class__")
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
except (TypeError, AttributeError):
|
2008-02-05 14:13:15 -04:00
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow del %r.__class__" % x)
|
|
|
|
cant(C(), list)
|
|
|
|
cant(list(), C)
|
|
|
|
cant(C(), 1)
|
|
|
|
cant(C(), object)
|
|
|
|
cant(object(), list)
|
|
|
|
cant(list(), object)
|
|
|
|
class Int(int): __slots__ = []
|
|
|
|
cant(True, int)
|
|
|
|
cant(2, bool)
|
|
|
|
o = object()
|
2022-05-08 11:10:11 -03:00
|
|
|
cant(o, int)
|
2008-02-05 14:13:15 -04:00
|
|
|
cant(o, type(None))
|
|
|
|
del o
|
|
|
|
class G(object):
|
|
|
|
__slots__ = ["a", "b"]
|
|
|
|
class H(object):
|
|
|
|
__slots__ = ["b", "a"]
|
|
|
|
class I(object):
|
|
|
|
__slots__ = ["a", "b"]
|
|
|
|
class J(object):
|
|
|
|
__slots__ = ["c", "b"]
|
|
|
|
class K(object):
|
|
|
|
__slots__ = ["a", "b", "d"]
|
|
|
|
class L(H):
|
|
|
|
__slots__ = ["e"]
|
|
|
|
class M(I):
|
|
|
|
__slots__ = ["e"]
|
|
|
|
class N(J):
|
|
|
|
__slots__ = ["__weakref__"]
|
|
|
|
class P(J):
|
|
|
|
__slots__ = ["__dict__"]
|
|
|
|
class Q(J):
|
|
|
|
pass
|
|
|
|
class R(J):
|
|
|
|
__slots__ = ["__dict__", "__weakref__"]
|
|
|
|
|
|
|
|
for cls, cls2 in ((G, H), (G, I), (I, H), (Q, R), (R, Q)):
|
|
|
|
x = cls()
|
|
|
|
x.a = 1
|
|
|
|
x.__class__ = cls2
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(x.__class__, cls2,
|
2008-02-05 14:13:15 -04:00
|
|
|
"assigning %r as __class__ for %r silently failed" % (cls2, x))
|
|
|
|
self.assertEqual(x.a, 1)
|
|
|
|
x.__class__ = cls
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIs(x.__class__, cls,
|
2008-02-05 14:13:15 -04:00
|
|
|
"assigning %r as __class__ for %r silently failed" % (cls, x))
|
|
|
|
self.assertEqual(x.a, 1)
|
|
|
|
for cls in G, J, K, L, M, N, P, R, list, Int:
|
|
|
|
for cls2 in G, J, K, L, M, N, P, R, list, Int:
|
|
|
|
if cls is cls2:
|
|
|
|
continue
|
|
|
|
cant(cls(), cls2)
|
|
|
|
|
2009-04-24 22:08:45 -03:00
|
|
|
# Issue5283: when __class__ changes in __del__, the wrong
|
|
|
|
# type gets DECREF'd.
|
|
|
|
class O(object):
|
|
|
|
pass
|
|
|
|
class A(object):
|
|
|
|
def __del__(self):
|
|
|
|
self.__class__ = O
|
|
|
|
l = [A() for x in range(100)]
|
|
|
|
del l
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_set_dict(self):
|
|
|
|
# Testing __dict__ assignment...
|
|
|
|
class C(object): pass
|
|
|
|
a = C()
|
|
|
|
a.__dict__ = {'b': 1}
|
|
|
|
self.assertEqual(a.b, 1)
|
|
|
|
def cant(x, dict):
|
|
|
|
try:
|
|
|
|
x.__dict__ = dict
|
|
|
|
except (AttributeError, TypeError):
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow %r.__dict__ = %r" % (x, dict))
|
|
|
|
cant(a, None)
|
|
|
|
cant(a, [])
|
|
|
|
cant(a, 1)
|
|
|
|
del a.__dict__ # Deleting __dict__ is allowed
|
|
|
|
|
|
|
|
class Base(object):
|
|
|
|
pass
|
|
|
|
def verify_dict_readonly(x):
|
|
|
|
"""
|
|
|
|
x has to be an instance of a class inheriting from Base.
|
|
|
|
"""
|
|
|
|
cant(x, {})
|
|
|
|
try:
|
|
|
|
del x.__dict__
|
|
|
|
except (AttributeError, TypeError):
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't allow del %r.__dict__" % x)
|
|
|
|
dict_descr = Base.__dict__["__dict__"]
|
|
|
|
try:
|
|
|
|
dict_descr.__set__(x, {})
|
|
|
|
except (AttributeError, TypeError):
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("dict_descr allowed access to %r's dict" % x)
|
|
|
|
|
|
|
|
# Classes don't allow __dict__ assignment and have readonly dicts
|
|
|
|
class Meta1(type, Base):
|
|
|
|
pass
|
|
|
|
class Meta2(Base, type):
|
|
|
|
pass
|
|
|
|
class D(object, metaclass=Meta1):
|
|
|
|
pass
|
|
|
|
class E(object, metaclass=Meta2):
|
|
|
|
pass
|
|
|
|
for cls in C, D, E:
|
|
|
|
verify_dict_readonly(cls)
|
|
|
|
class_dict = cls.__dict__
|
|
|
|
try:
|
|
|
|
class_dict["spam"] = "eggs"
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("%r's __dict__ can be modified" % cls)
|
|
|
|
|
|
|
|
# Modules also disallow __dict__ assignment
|
|
|
|
class Module1(types.ModuleType, Base):
|
|
|
|
pass
|
|
|
|
class Module2(Base, types.ModuleType):
|
|
|
|
pass
|
|
|
|
for ModuleType in Module1, Module2:
|
|
|
|
mod = ModuleType("spam")
|
|
|
|
verify_dict_readonly(mod)
|
|
|
|
mod.__dict__["spam"] = "eggs"
|
|
|
|
|
|
|
|
# Exception's __dict__ can be replaced, but not deleted
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# (at least not any more than regular exception's __dict__ can
|
|
|
|
# be deleted; on CPython it is not the case, whereas on PyPy they
|
|
|
|
# can, just like any other new-style instance's __dict__.)
|
|
|
|
def can_delete_dict(e):
|
|
|
|
try:
|
|
|
|
del e.__dict__
|
|
|
|
except (TypeError, AttributeError):
|
|
|
|
return False
|
|
|
|
else:
|
|
|
|
return True
|
2008-02-05 14:13:15 -04:00
|
|
|
class Exception1(Exception, Base):
|
|
|
|
pass
|
|
|
|
class Exception2(Base, Exception):
|
|
|
|
pass
|
|
|
|
for ExceptionType in Exception, Exception1, Exception2:
|
|
|
|
e = ExceptionType()
|
|
|
|
e.__dict__ = {"a": 1}
|
|
|
|
self.assertEqual(e.a, 1)
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
self.assertEqual(can_delete_dict(e), can_delete_dict(ValueError()))
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_binary_operator_override(self):
|
|
|
|
# Testing overrides of binary operations...
|
|
|
|
class I(int):
|
|
|
|
def __repr__(self):
|
|
|
|
return "I(%r)" % int(self)
|
|
|
|
def __add__(self, other):
|
|
|
|
return I(int(self) + int(other))
|
|
|
|
__radd__ = __add__
|
|
|
|
def __pow__(self, other, mod=None):
|
|
|
|
if mod is None:
|
|
|
|
return I(pow(int(self), int(other)))
|
|
|
|
else:
|
|
|
|
return I(pow(int(self), int(other), int(mod)))
|
|
|
|
def __rpow__(self, other, mod=None):
|
|
|
|
if mod is None:
|
|
|
|
return I(pow(int(other), int(self), mod))
|
|
|
|
else:
|
|
|
|
return I(pow(int(other), int(self), int(mod)))
|
|
|
|
|
|
|
|
self.assertEqual(repr(I(1) + I(2)), "I(3)")
|
|
|
|
self.assertEqual(repr(I(1) + 2), "I(3)")
|
|
|
|
self.assertEqual(repr(1 + I(2)), "I(3)")
|
|
|
|
self.assertEqual(repr(I(2) ** I(3)), "I(8)")
|
|
|
|
self.assertEqual(repr(2 ** I(3)), "I(8)")
|
|
|
|
self.assertEqual(repr(I(2) ** 3), "I(8)")
|
|
|
|
self.assertEqual(repr(pow(I(2), I(3), I(5))), "I(3)")
|
|
|
|
class S(str):
|
|
|
|
def __eq__(self, other):
|
|
|
|
return self.lower() == other.lower()
|
|
|
|
|
|
|
|
def test_subclass_propagation(self):
|
|
|
|
# Testing propagation of slot functions to subclasses...
|
|
|
|
class A(object):
|
|
|
|
pass
|
|
|
|
class B(A):
|
|
|
|
pass
|
|
|
|
class C(A):
|
|
|
|
pass
|
|
|
|
class D(B, C):
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
orig_hash = hash(d) # related to id(d) in platform-dependent ways
|
|
|
|
A.__hash__ = lambda self: 42
|
|
|
|
self.assertEqual(hash(d), 42)
|
|
|
|
C.__hash__ = lambda self: 314
|
|
|
|
self.assertEqual(hash(d), 314)
|
|
|
|
B.__hash__ = lambda self: 144
|
|
|
|
self.assertEqual(hash(d), 144)
|
|
|
|
D.__hash__ = lambda self: 100
|
|
|
|
self.assertEqual(hash(d), 100)
|
2008-07-15 12:46:38 -03:00
|
|
|
D.__hash__ = None
|
|
|
|
self.assertRaises(TypeError, hash, d)
|
2008-02-05 14:13:15 -04:00
|
|
|
del D.__hash__
|
|
|
|
self.assertEqual(hash(d), 144)
|
2008-07-15 12:46:38 -03:00
|
|
|
B.__hash__ = None
|
|
|
|
self.assertRaises(TypeError, hash, d)
|
2008-02-05 14:13:15 -04:00
|
|
|
del B.__hash__
|
|
|
|
self.assertEqual(hash(d), 314)
|
2008-07-15 12:46:38 -03:00
|
|
|
C.__hash__ = None
|
|
|
|
self.assertRaises(TypeError, hash, d)
|
2008-02-05 14:13:15 -04:00
|
|
|
del C.__hash__
|
|
|
|
self.assertEqual(hash(d), 42)
|
2008-07-15 12:46:38 -03:00
|
|
|
A.__hash__ = None
|
|
|
|
self.assertRaises(TypeError, hash, d)
|
2008-02-05 14:13:15 -04:00
|
|
|
del A.__hash__
|
|
|
|
self.assertEqual(hash(d), orig_hash)
|
|
|
|
d.foo = 42
|
|
|
|
d.bar = 42
|
|
|
|
self.assertEqual(d.foo, 42)
|
|
|
|
self.assertEqual(d.bar, 42)
|
|
|
|
def __getattribute__(self, name):
|
|
|
|
if name == "foo":
|
|
|
|
return 24
|
|
|
|
return object.__getattribute__(self, name)
|
|
|
|
A.__getattribute__ = __getattribute__
|
|
|
|
self.assertEqual(d.foo, 24)
|
|
|
|
self.assertEqual(d.bar, 42)
|
|
|
|
def __getattr__(self, name):
|
|
|
|
if name in ("spam", "foo", "bar"):
|
|
|
|
return "hello"
|
|
|
|
raise AttributeError(name)
|
|
|
|
B.__getattr__ = __getattr__
|
|
|
|
self.assertEqual(d.spam, "hello")
|
|
|
|
self.assertEqual(d.foo, 24)
|
|
|
|
self.assertEqual(d.bar, 42)
|
|
|
|
del A.__getattribute__
|
|
|
|
self.assertEqual(d.foo, 42)
|
|
|
|
del d.foo
|
|
|
|
self.assertEqual(d.foo, "hello")
|
|
|
|
self.assertEqual(d.bar, 42)
|
|
|
|
del B.__getattr__
|
|
|
|
try:
|
|
|
|
d.foo
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("d.foo should be undefined now")
|
|
|
|
|
|
|
|
# Test a nasty bug in recurse_down_subclasses()
|
|
|
|
class A(object):
|
|
|
|
pass
|
|
|
|
class B(A):
|
|
|
|
pass
|
|
|
|
del B
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
A.__setitem__ = lambda *a: None # crash
|
|
|
|
|
|
|
|
def test_buffer_inheritance(self):
|
|
|
|
# Testing that buffer interface is inherited ...
|
|
|
|
|
|
|
|
import binascii
|
|
|
|
# SF bug [#470040] ParseTuple t# vs subclasses.
|
|
|
|
|
2008-12-02 02:00:15 -04:00
|
|
|
class MyBytes(bytes):
|
2008-02-05 14:13:15 -04:00
|
|
|
pass
|
2008-12-02 02:00:15 -04:00
|
|
|
base = b'abc'
|
|
|
|
m = MyBytes(base)
|
2008-02-05 14:13:15 -04:00
|
|
|
# b2a_hex uses the buffer interface to get its argument's value, via
|
|
|
|
# PyArg_ParseTuple 't#' code.
|
|
|
|
self.assertEqual(binascii.b2a_hex(m), binascii.b2a_hex(base))
|
|
|
|
|
|
|
|
class MyInt(int):
|
|
|
|
pass
|
|
|
|
m = MyInt(42)
|
|
|
|
try:
|
|
|
|
binascii.b2a_hex(m)
|
|
|
|
self.fail('subclass of int should not have a buffer interface')
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
def test_str_of_str_subclass(self):
|
|
|
|
# Testing __str__ defined in subclass of str ...
|
|
|
|
import binascii
|
|
|
|
|
|
|
|
class octetstring(str):
|
|
|
|
def __str__(self):
|
2008-12-02 02:00:15 -04:00
|
|
|
return binascii.b2a_hex(self.encode('ascii')).decode("ascii")
|
2008-02-05 14:13:15 -04:00
|
|
|
def __repr__(self):
|
|
|
|
return self + " repr"
|
|
|
|
|
|
|
|
o = octetstring('A')
|
|
|
|
self.assertEqual(type(o), octetstring)
|
|
|
|
self.assertEqual(type(str(o)), str)
|
|
|
|
self.assertEqual(type(repr(o)), str)
|
|
|
|
self.assertEqual(ord(o), 0x41)
|
|
|
|
self.assertEqual(str(o), '41')
|
|
|
|
self.assertEqual(repr(o), 'A repr')
|
|
|
|
self.assertEqual(o.__str__(), '41')
|
|
|
|
self.assertEqual(o.__repr__(), 'A repr')
|
|
|
|
|
2022-10-30 03:23:20 -03:00
|
|
|
def test_repr_with_module_str_subclass(self):
|
|
|
|
# gh-98783
|
|
|
|
class StrSub(str):
|
|
|
|
pass
|
|
|
|
class Some:
|
|
|
|
pass
|
|
|
|
Some.__module__ = StrSub('example')
|
|
|
|
self.assertIsInstance(repr(Some), str) # should not crash
|
|
|
|
self.assertIsInstance(repr(Some()), str) # should not crash
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_keyword_arguments(self):
|
|
|
|
# Testing keyword arguments to __init__, __call__...
|
|
|
|
def f(a): return a
|
|
|
|
self.assertEqual(f.__call__(a=42), 42)
|
2017-03-06 15:08:59 -04:00
|
|
|
ba = bytearray()
|
|
|
|
bytearray.__init__(ba, 'abc\xbd\u20ac',
|
|
|
|
encoding='latin1', errors='replace')
|
|
|
|
self.assertEqual(ba, b'abc\xbd?')
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_recursive_call(self):
|
|
|
|
# Testing recursive __call__() by setting to instance of class...
|
|
|
|
class A(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
A.__call__ = A()
|
2022-01-08 04:14:40 -04:00
|
|
|
with self.assertRaises(RecursionError):
|
2008-02-05 14:13:15 -04:00
|
|
|
A()()
|
|
|
|
|
|
|
|
def test_delete_hook(self):
|
|
|
|
# Testing __del__ hook...
|
|
|
|
log = []
|
|
|
|
class C(object):
|
|
|
|
def __del__(self):
|
|
|
|
log.append(1)
|
|
|
|
c = C()
|
|
|
|
self.assertEqual(log, [])
|
|
|
|
del c
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(log, [1])
|
|
|
|
|
|
|
|
class D(object): pass
|
|
|
|
d = D()
|
|
|
|
try: del d[0]
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("invalid del() didn't raise TypeError")
|
|
|
|
|
|
|
|
def test_hash_inheritance(self):
|
|
|
|
# Testing hash of mutable subclasses...
|
|
|
|
|
|
|
|
class mydict(dict):
|
|
|
|
pass
|
|
|
|
d = mydict()
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
hash(d)
|
|
|
|
except TypeError:
|
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
iteration, or an iterator object" is getting to be a PITA. Many
months ago I suggested factoring this out into "iterable object",
where the definition of that could include being explicit about
generators too (as is, I'm not sure a reader outside of PythonLabs
could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
2001-10-26 02:06:50 -03:00
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("hash() of dict subclass should fail")
|
2003-03-12 00:25:42 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class mylist(list):
|
|
|
|
pass
|
|
|
|
d = mylist()
|
2002-11-25 17:38:52 -04:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
hash(d)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
2002-11-25 17:38:52 -04:00
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("hash() of list subclass should fail")
|
|
|
|
|
|
|
|
def test_str_operations(self):
|
|
|
|
try: 'a' + 5
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("'' + 5 doesn't raise TypeError")
|
|
|
|
|
|
|
|
try: ''.split('')
|
|
|
|
except ValueError: pass
|
|
|
|
else: self.fail("''.split('') doesn't raise ValueError")
|
|
|
|
|
|
|
|
try: ''.join([0])
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("''.join([0]) doesn't raise TypeError")
|
|
|
|
|
|
|
|
try: ''.rindex('5')
|
|
|
|
except ValueError: pass
|
|
|
|
else: self.fail("''.rindex('5') doesn't raise ValueError")
|
|
|
|
|
|
|
|
try: '%(n)s' % None
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("'%(n)s' % None doesn't raise TypeError")
|
|
|
|
|
|
|
|
try: '%(n' % {}
|
|
|
|
except ValueError: pass
|
|
|
|
else: self.fail("'%(n' % {} '' doesn't raise ValueError")
|
|
|
|
|
|
|
|
try: '%*s' % ('abc')
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("'%*s' % ('abc') doesn't raise TypeError")
|
|
|
|
|
|
|
|
try: '%*.*s' % ('abc', 5)
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("'%*.*s' % ('abc', 5) doesn't raise TypeError")
|
|
|
|
|
|
|
|
try: '%s' % (1, 2)
|
|
|
|
except TypeError: pass
|
|
|
|
else: self.fail("'%s' % (1, 2) doesn't raise TypeError")
|
|
|
|
|
|
|
|
try: '%' % None
|
|
|
|
except ValueError: pass
|
|
|
|
else: self.fail("'%' % None doesn't raise ValueError")
|
|
|
|
|
|
|
|
self.assertEqual('534253'.isdigit(), 1)
|
|
|
|
self.assertEqual('534253x'.isdigit(), 0)
|
|
|
|
self.assertEqual('%c' % 5, '\x05')
|
|
|
|
self.assertEqual('%c' % '5', '5')
|
|
|
|
|
|
|
|
def test_deepcopy_recursive(self):
|
|
|
|
# Testing deepcopy of recursive objects...
|
|
|
|
class Node:
|
|
|
|
pass
|
|
|
|
a = Node()
|
|
|
|
b = Node()
|
|
|
|
a.b = b
|
|
|
|
b.a = a
|
|
|
|
z = deepcopy(a) # This blew up before
|
|
|
|
|
2016-05-08 10:48:10 -03:00
|
|
|
def test_uninitialized_modules(self):
|
2008-02-05 14:13:15 -04:00
|
|
|
# Testing uninitialized module objects...
|
|
|
|
from types import ModuleType as M
|
|
|
|
m = M.__new__(M)
|
|
|
|
str(m)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(m, "__name__")
|
|
|
|
self.assertNotHasAttr(m, "__file__")
|
|
|
|
self.assertNotHasAttr(m, "foo")
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
self.assertFalse(m.__dict__) # None or {} are both reasonable answers
|
2008-02-05 14:13:15 -04:00
|
|
|
m.foo = 1
|
|
|
|
self.assertEqual(m.__dict__, {"foo": 1})
|
|
|
|
|
|
|
|
def test_funny_new(self):
|
|
|
|
# Testing __new__ returning something unexpected...
|
2002-06-04 16:52:53 -03:00
|
|
|
class C(object):
|
2008-02-05 14:13:15 -04:00
|
|
|
def __new__(cls, arg):
|
|
|
|
if isinstance(arg, str): return [1, 2, 3]
|
|
|
|
elif isinstance(arg, int): return object.__new__(D)
|
|
|
|
else: return object.__new__(cls)
|
|
|
|
class D(C):
|
|
|
|
def __init__(self, arg):
|
|
|
|
self.foo = arg
|
|
|
|
self.assertEqual(C("1"), [1, 2, 3])
|
|
|
|
self.assertEqual(D("1"), [1, 2, 3])
|
|
|
|
d = D(None)
|
|
|
|
self.assertEqual(d.foo, None)
|
|
|
|
d = C(1)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(d, D)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(d.foo, 1)
|
|
|
|
d = D(1)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(d, D)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(d.foo, 1)
|
|
|
|
|
2016-12-02 02:42:43 -04:00
|
|
|
class C(object):
|
|
|
|
@staticmethod
|
|
|
|
def __new__(*args):
|
|
|
|
return args
|
|
|
|
self.assertEqual(C(1, 2), (C, 1, 2))
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
self.assertEqual(D(1, 2), (D, 1, 2))
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
@classmethod
|
|
|
|
def __new__(*args):
|
|
|
|
return args
|
|
|
|
self.assertEqual(C(1, 2), (C, C, 1, 2))
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
self.assertEqual(D(1, 2), (D, D, 1, 2))
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_imul_bug(self):
|
|
|
|
# Testing for __imul__ problems...
|
|
|
|
# SF bug 544647
|
2002-06-04 16:52:53 -03:00
|
|
|
class C(object):
|
2008-02-05 14:13:15 -04:00
|
|
|
def __imul__(self, other):
|
|
|
|
return (self, other)
|
|
|
|
x = C()
|
|
|
|
y = x
|
|
|
|
y *= 1.0
|
|
|
|
self.assertEqual(y, (x, 1.0))
|
|
|
|
y = x
|
|
|
|
y *= 2
|
|
|
|
self.assertEqual(y, (x, 2))
|
|
|
|
y = x
|
|
|
|
y *= 3
|
|
|
|
self.assertEqual(y, (x, 3))
|
|
|
|
y = x
|
|
|
|
y *= 1<<100
|
|
|
|
self.assertEqual(y, (x, 1<<100))
|
|
|
|
y = x
|
|
|
|
y *= None
|
|
|
|
self.assertEqual(y, (x, None))
|
|
|
|
y = x
|
|
|
|
y *= "foo"
|
|
|
|
self.assertEqual(y, (x, "foo"))
|
|
|
|
|
|
|
|
def test_copy_setstate(self):
|
|
|
|
# Testing that copy.*copy() correctly uses __setstate__...
|
|
|
|
import copy
|
2002-06-04 16:52:53 -03:00
|
|
|
class C(object):
|
2008-02-05 14:13:15 -04:00
|
|
|
def __init__(self, foo=None):
|
|
|
|
self.foo = foo
|
|
|
|
self.__foo = foo
|
|
|
|
def setfoo(self, foo=None):
|
|
|
|
self.foo = foo
|
|
|
|
def getfoo(self):
|
|
|
|
return self.__foo
|
|
|
|
def __getstate__(self):
|
|
|
|
return [self.foo]
|
|
|
|
def __setstate__(self_, lst):
|
|
|
|
self.assertEqual(len(lst), 1)
|
|
|
|
self_.__foo = self_.foo = lst[0]
|
|
|
|
a = C(42)
|
|
|
|
a.setfoo(24)
|
|
|
|
self.assertEqual(a.foo, 24)
|
|
|
|
self.assertEqual(a.getfoo(), 42)
|
|
|
|
b = copy.copy(a)
|
|
|
|
self.assertEqual(b.foo, 24)
|
|
|
|
self.assertEqual(b.getfoo(), 24)
|
|
|
|
b = copy.deepcopy(a)
|
|
|
|
self.assertEqual(b.foo, 24)
|
|
|
|
self.assertEqual(b.getfoo(), 24)
|
|
|
|
|
|
|
|
def test_slices(self):
|
|
|
|
# Testing cases with slices and overridden __getitem__ ...
|
|
|
|
|
|
|
|
# Strings
|
|
|
|
self.assertEqual("hello"[:4], "hell")
|
|
|
|
self.assertEqual("hello"[slice(4)], "hell")
|
|
|
|
self.assertEqual(str.__getitem__("hello", slice(4)), "hell")
|
|
|
|
class S(str):
|
|
|
|
def __getitem__(self, x):
|
|
|
|
return str.__getitem__(self, x)
|
|
|
|
self.assertEqual(S("hello")[:4], "hell")
|
|
|
|
self.assertEqual(S("hello")[slice(4)], "hell")
|
|
|
|
self.assertEqual(S("hello").__getitem__(slice(4)), "hell")
|
|
|
|
# Tuples
|
|
|
|
self.assertEqual((1,2,3)[:2], (1,2))
|
|
|
|
self.assertEqual((1,2,3)[slice(2)], (1,2))
|
|
|
|
self.assertEqual(tuple.__getitem__((1,2,3), slice(2)), (1,2))
|
|
|
|
class T(tuple):
|
|
|
|
def __getitem__(self, x):
|
|
|
|
return tuple.__getitem__(self, x)
|
|
|
|
self.assertEqual(T((1,2,3))[:2], (1,2))
|
|
|
|
self.assertEqual(T((1,2,3))[slice(2)], (1,2))
|
|
|
|
self.assertEqual(T((1,2,3)).__getitem__(slice(2)), (1,2))
|
|
|
|
# Lists
|
|
|
|
self.assertEqual([1,2,3][:2], [1,2])
|
|
|
|
self.assertEqual([1,2,3][slice(2)], [1,2])
|
|
|
|
self.assertEqual(list.__getitem__([1,2,3], slice(2)), [1,2])
|
|
|
|
class L(list):
|
|
|
|
def __getitem__(self, x):
|
|
|
|
return list.__getitem__(self, x)
|
|
|
|
self.assertEqual(L([1,2,3])[:2], [1,2])
|
|
|
|
self.assertEqual(L([1,2,3])[slice(2)], [1,2])
|
|
|
|
self.assertEqual(L([1,2,3]).__getitem__(slice(2)), [1,2])
|
|
|
|
# Now do lists and __setitem__
|
|
|
|
a = L([1,2,3])
|
|
|
|
a[slice(1, 3)] = [3,2]
|
|
|
|
self.assertEqual(a, [1,3,2])
|
|
|
|
a[slice(0, 2, 1)] = [3,1]
|
|
|
|
self.assertEqual(a, [3,1,2])
|
|
|
|
a.__setitem__(slice(1, 3), [2,1])
|
|
|
|
self.assertEqual(a, [3,2,1])
|
|
|
|
a.__setitem__(slice(0, 2, 1), [2,3])
|
|
|
|
self.assertEqual(a, [2,3,1])
|
|
|
|
|
|
|
|
def test_subtype_resurrection(self):
|
|
|
|
# Testing resurrection of new-style instance...
|
|
|
|
|
2007-06-11 18:38:39 -03:00
|
|
|
class C(object):
|
2008-02-05 14:13:15 -04:00
|
|
|
container = []
|
|
|
|
|
|
|
|
def __del__(self):
|
|
|
|
# resurrect the instance
|
|
|
|
C.container.append(self)
|
|
|
|
|
|
|
|
c = C()
|
|
|
|
c.attr = 42
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
# The most interesting thing here is whether this blows up, due to
|
|
|
|
# flawed GC tracking logic in typeobject.c's call_finalizer() (a 2.2.1
|
|
|
|
# bug).
|
2008-02-05 14:13:15 -04:00
|
|
|
del c
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(len(C.container), 1)
|
|
|
|
|
|
|
|
# Make c mortal again, so that the test framework with -l doesn't report
|
|
|
|
# it as a leak.
|
|
|
|
del C.__del__
|
|
|
|
|
|
|
|
def test_slots_trash(self):
|
|
|
|
# Testing slot trash...
|
|
|
|
# Deallocating deeply nested slotted trash caused stack overflows
|
|
|
|
class trash(object):
|
|
|
|
__slots__ = ['x']
|
|
|
|
def __init__(self, x):
|
|
|
|
self.x = x
|
|
|
|
o = None
|
|
|
|
for i in range(50000):
|
|
|
|
o = trash(o)
|
|
|
|
del o
|
|
|
|
|
|
|
|
def test_slots_multiple_inheritance(self):
|
|
|
|
# SF bug 575229, multiple inheritance w/ slots dumps core
|
|
|
|
class A(object):
|
|
|
|
__slots__=()
|
|
|
|
class B(object):
|
|
|
|
pass
|
|
|
|
class C(A,B) :
|
|
|
|
__slots__=()
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
if support.check_impl_detail():
|
|
|
|
self.assertEqual(C.__basicsize__, B.__basicsize__)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertHasAttr(C, '__dict__')
|
|
|
|
self.assertHasAttr(C, '__weakref__')
|
2008-02-05 14:13:15 -04:00
|
|
|
C().x = 2
|
|
|
|
|
|
|
|
def test_rmul(self):
|
|
|
|
# Testing correct invocation of __rmul__...
|
|
|
|
# SF patch 592646
|
2001-08-02 01:15:00 -03:00
|
|
|
class C(object):
|
2008-02-05 14:13:15 -04:00
|
|
|
def __mul__(self, other):
|
|
|
|
return "mul"
|
|
|
|
def __rmul__(self, other):
|
|
|
|
return "rmul"
|
|
|
|
a = C()
|
|
|
|
self.assertEqual(a*2, "mul")
|
|
|
|
self.assertEqual(a*2.2, "mul")
|
|
|
|
self.assertEqual(2*a, "rmul")
|
|
|
|
self.assertEqual(2.2*a, "rmul")
|
|
|
|
|
|
|
|
def test_ipow(self):
|
|
|
|
# Testing correct invocation of __ipow__...
|
|
|
|
# [SF bug 620179]
|
2001-08-02 01:15:00 -03:00
|
|
|
class C(object):
|
2008-02-05 14:13:15 -04:00
|
|
|
def __ipow__(self, other):
|
|
|
|
pass
|
|
|
|
a = C()
|
|
|
|
a **= 2
|
2001-08-02 01:15:00 -03:00
|
|
|
|
2021-02-26 15:58:39 -04:00
|
|
|
def test_ipow_returns_not_implemented(self):
|
|
|
|
class A:
|
|
|
|
def __ipow__(self, other):
|
|
|
|
return NotImplemented
|
|
|
|
|
|
|
|
class B(A):
|
|
|
|
def __rpow__(self, other):
|
|
|
|
return 1
|
|
|
|
|
|
|
|
class C(A):
|
|
|
|
def __pow__(self, other):
|
|
|
|
return 2
|
|
|
|
a = A()
|
|
|
|
b = B()
|
|
|
|
c = C()
|
|
|
|
|
|
|
|
a **= b
|
|
|
|
self.assertEqual(a, 1)
|
|
|
|
|
|
|
|
c **= b
|
|
|
|
self.assertEqual(c, 2)
|
|
|
|
|
|
|
|
def test_no_ipow(self):
|
|
|
|
class B:
|
|
|
|
def __rpow__(self, other):
|
|
|
|
return 1
|
|
|
|
|
|
|
|
a = object()
|
|
|
|
b = B()
|
|
|
|
a **= b
|
|
|
|
self.assertEqual(a, 1)
|
|
|
|
|
|
|
|
def test_ipow_exception_text(self):
|
|
|
|
x = None
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
x **= 2
|
|
|
|
self.assertIn('unsupported operand type(s) for **=', str(cm.exception))
|
|
|
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
y = x ** 2
|
|
|
|
self.assertIn('unsupported operand type(s) for **', str(cm.exception))
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_mutable_bases(self):
|
|
|
|
# Testing mutable bases...
|
2005-12-29 13:07:39 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
# stuff that should work:
|
|
|
|
class C(object):
|
2007-03-18 12:41:51 -03:00
|
|
|
pass
|
2008-02-05 14:13:15 -04:00
|
|
|
class C2(object):
|
|
|
|
def __getattribute__(self, attr):
|
|
|
|
if attr == 'a':
|
|
|
|
return 2
|
|
|
|
else:
|
|
|
|
return super(C2, self).__getattribute__(attr)
|
|
|
|
def meth(self):
|
2007-03-18 12:41:51 -03:00
|
|
|
return 1
|
2008-02-05 14:13:15 -04:00
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
class E(D):
|
|
|
|
pass
|
|
|
|
d = D()
|
|
|
|
e = E()
|
|
|
|
D.__bases__ = (C,)
|
|
|
|
D.__bases__ = (C2,)
|
|
|
|
self.assertEqual(d.meth(), 1)
|
|
|
|
self.assertEqual(e.meth(), 1)
|
|
|
|
self.assertEqual(d.a, 2)
|
|
|
|
self.assertEqual(e.a, 2)
|
|
|
|
self.assertEqual(C2.__subclasses__(), [D])
|
|
|
|
|
|
|
|
try:
|
|
|
|
del D.__bases__
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
except (TypeError, AttributeError):
|
2008-02-05 14:13:15 -04:00
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't be able to delete .__bases__")
|
2001-08-02 01:15:00 -03:00
|
|
|
|
2001-09-24 18:17:50 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
D.__bases__ = ()
|
|
|
|
except TypeError as msg:
|
|
|
|
if str(msg) == "a new-style class can't have only classic bases":
|
|
|
|
self.fail("wrong error message for .__bases__ = ()")
|
2001-09-24 18:17:50 -03:00
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't be able to set .__bases__ to ()")
|
|
|
|
|
2001-09-13 16:33:07 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
D.__bases__ = (D,)
|
2001-09-13 16:33:07 -03:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
# actually, we'll have crashed by here...
|
|
|
|
self.fail("shouldn't be able to create inheritance cycles")
|
2006-08-23 21:41:19 -03:00
|
|
|
|
2001-09-25 00:43:42 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
D.__bases__ = (C, C)
|
2001-09-25 00:43:42 -03:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("didn't detect repeated base classes")
|
|
|
|
|
2002-04-14 22:03:30 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
D.__bases__ = (E,)
|
2002-04-14 22:03:30 -03:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't be able to create inheritance cycles")
|
|
|
|
|
2009-04-18 17:54:08 -03:00
|
|
|
def test_builtin_bases(self):
|
|
|
|
# Make sure all the builtin types can have their base queried without
|
|
|
|
# segfaulting. See issue #5787.
|
|
|
|
builtin_types = [tp for tp in builtins.__dict__.values()
|
|
|
|
if isinstance(tp, type)]
|
|
|
|
for tp in builtin_types:
|
|
|
|
object.__getattribute__(tp, "__bases__")
|
|
|
|
if tp is not object:
|
2021-10-22 20:13:46 -03:00
|
|
|
if tp is ExceptionGroup:
|
|
|
|
num_bases = 2
|
|
|
|
else:
|
|
|
|
num_bases = 1
|
|
|
|
self.assertEqual(len(tp.__bases__), num_bases, tp)
|
2009-04-18 17:54:08 -03:00
|
|
|
|
Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70768 | andrew.kuchling | 2009-03-30 17:29:15 -0500 (Mon, 30 Mar 2009) | 1 line
Typo fixes
........
r71657 | vinay.sajip | 2009-04-16 14:07:37 -0500 (Thu, 16 Apr 2009) | 1 line
Issue #5768: Change to Unicode output logic and test case for same.
........
r71721 | benjamin.peterson | 2009-04-18 14:26:19 -0500 (Sat, 18 Apr 2009) | 1 line
fix a few nits in unittest.py #5771
........
r71729 | benjamin.peterson | 2009-04-18 16:03:10 -0500 (Sat, 18 Apr 2009) | 1 line
move test to a more appropiate one
........
r71794 | vinay.sajip | 2009-04-22 07:10:47 -0500 (Wed, 22 Apr 2009) | 2 lines
Issue #5170: Fixed regression caused when fixing #5768.
........
r71976 | mark.dickinson | 2009-04-26 14:54:55 -0500 (Sun, 26 Apr 2009) | 2 lines
Fix typo in function name
........
r72036 | georg.brandl | 2009-04-27 12:04:23 -0500 (Mon, 27 Apr 2009) | 1 line
#5848: small unittest doc patch.
........
r72037 | georg.brandl | 2009-04-27 12:09:53 -0500 (Mon, 27 Apr 2009) | 1 line
#5840: dont claim we dont support TLS.
........
r72079 | r.david.murray | 2009-04-28 14:02:55 -0500 (Tue, 28 Apr 2009) | 2 lines
Remove spurious 'u'.
........
r72085 | georg.brandl | 2009-04-28 16:48:35 -0500 (Tue, 28 Apr 2009) | 1 line
Make the doctests in the docs pass, except for those in the turtle module.
........
r72131 | benjamin.peterson | 2009-04-29 17:43:35 -0500 (Wed, 29 Apr 2009) | 1 line
fix test_shutil on ZFS #5676
........
r72132 | georg.brandl | 2009-04-29 17:44:07 -0500 (Wed, 29 Apr 2009) | 1 line
#5878: fix repr of re object.
........
r72133 | benjamin.peterson | 2009-04-29 17:44:15 -0500 (Wed, 29 Apr 2009) | 1 line
make sure mode is removable while cleaning up test droppings
........
r72134 | benjamin.peterson | 2009-04-29 19:06:33 -0500 (Wed, 29 Apr 2009) | 1 line
make sure to close file
........
r72191 | michael.foord | 2009-05-02 06:43:06 -0500 (Sat, 02 May 2009) | 9 lines
Adds an exit parameter to unittest.main(). If False main no longer
calls sys.exit.
Closes issue 3379.
Michael Foord
........
r72197 | benjamin.peterson | 2009-05-02 11:24:37 -0500 (Sat, 02 May 2009) | 1 line
don't let sys.argv be used in the tests
........
r72198 | andrew.kuchling | 2009-05-02 12:12:15 -0500 (Sat, 02 May 2009) | 1 line
Add items
........
r72219 | michael.foord | 2009-05-02 15:15:05 -0500 (Sat, 02 May 2009) | 8 lines
Add addCleanup and doCleanups to unittest.TestCase.
Closes issue 5679.
Michael Foord
........
r72221 | benjamin.peterson | 2009-05-02 15:26:53 -0500 (Sat, 02 May 2009) | 1 line
add myself
........
r72225 | michael.foord | 2009-05-02 17:43:34 -0500 (Sat, 02 May 2009) | 1 line
........
r72303 | benjamin.peterson | 2009-05-04 19:55:24 -0500 (Mon, 04 May 2009) | 1 line
using sys._getframe(x), where x > 0 doesnt' work on IronPython
........
r72434 | r.david.murray | 2009-05-07 13:09:58 -0500 (Thu, 07 May 2009) | 2 lines
Pre-opened test file needs to be opened in binary mode.
........
r72467 | georg.brandl | 2009-05-08 07:17:34 -0500 (Fri, 08 May 2009) | 1 line
Fix name.
........
r72476 | thomas.heller | 2009-05-08 15:09:40 -0500 (Fri, 08 May 2009) | 4 lines
Add a file that contains diffs between offical libffi files and the
files in this repository. Should make it easier to merge new libffi
versions.
........
2009-05-08 17:42:26 -03:00
|
|
|
class L(list):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
|
|
|
|
try:
|
|
|
|
L.__bases__ = (dict,)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't turn list subclass into dict subclass")
|
|
|
|
|
|
|
|
try:
|
|
|
|
list.__bases__ = (dict,)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("shouldn't be able to assign to list.__bases__")
|
|
|
|
|
|
|
|
try:
|
|
|
|
D.__bases__ = (C, list)
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2022-01-07 23:51:51 -04:00
|
|
|
self.fail("best_base calculation found wanting")
|
Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70768 | andrew.kuchling | 2009-03-30 17:29:15 -0500 (Mon, 30 Mar 2009) | 1 line
Typo fixes
........
r71657 | vinay.sajip | 2009-04-16 14:07:37 -0500 (Thu, 16 Apr 2009) | 1 line
Issue #5768: Change to Unicode output logic and test case for same.
........
r71721 | benjamin.peterson | 2009-04-18 14:26:19 -0500 (Sat, 18 Apr 2009) | 1 line
fix a few nits in unittest.py #5771
........
r71729 | benjamin.peterson | 2009-04-18 16:03:10 -0500 (Sat, 18 Apr 2009) | 1 line
move test to a more appropiate one
........
r71794 | vinay.sajip | 2009-04-22 07:10:47 -0500 (Wed, 22 Apr 2009) | 2 lines
Issue #5170: Fixed regression caused when fixing #5768.
........
r71976 | mark.dickinson | 2009-04-26 14:54:55 -0500 (Sun, 26 Apr 2009) | 2 lines
Fix typo in function name
........
r72036 | georg.brandl | 2009-04-27 12:04:23 -0500 (Mon, 27 Apr 2009) | 1 line
#5848: small unittest doc patch.
........
r72037 | georg.brandl | 2009-04-27 12:09:53 -0500 (Mon, 27 Apr 2009) | 1 line
#5840: dont claim we dont support TLS.
........
r72079 | r.david.murray | 2009-04-28 14:02:55 -0500 (Tue, 28 Apr 2009) | 2 lines
Remove spurious 'u'.
........
r72085 | georg.brandl | 2009-04-28 16:48:35 -0500 (Tue, 28 Apr 2009) | 1 line
Make the doctests in the docs pass, except for those in the turtle module.
........
r72131 | benjamin.peterson | 2009-04-29 17:43:35 -0500 (Wed, 29 Apr 2009) | 1 line
fix test_shutil on ZFS #5676
........
r72132 | georg.brandl | 2009-04-29 17:44:07 -0500 (Wed, 29 Apr 2009) | 1 line
#5878: fix repr of re object.
........
r72133 | benjamin.peterson | 2009-04-29 17:44:15 -0500 (Wed, 29 Apr 2009) | 1 line
make sure mode is removable while cleaning up test droppings
........
r72134 | benjamin.peterson | 2009-04-29 19:06:33 -0500 (Wed, 29 Apr 2009) | 1 line
make sure to close file
........
r72191 | michael.foord | 2009-05-02 06:43:06 -0500 (Sat, 02 May 2009) | 9 lines
Adds an exit parameter to unittest.main(). If False main no longer
calls sys.exit.
Closes issue 3379.
Michael Foord
........
r72197 | benjamin.peterson | 2009-05-02 11:24:37 -0500 (Sat, 02 May 2009) | 1 line
don't let sys.argv be used in the tests
........
r72198 | andrew.kuchling | 2009-05-02 12:12:15 -0500 (Sat, 02 May 2009) | 1 line
Add items
........
r72219 | michael.foord | 2009-05-02 15:15:05 -0500 (Sat, 02 May 2009) | 8 lines
Add addCleanup and doCleanups to unittest.TestCase.
Closes issue 5679.
Michael Foord
........
r72221 | benjamin.peterson | 2009-05-02 15:26:53 -0500 (Sat, 02 May 2009) | 1 line
add myself
........
r72225 | michael.foord | 2009-05-02 17:43:34 -0500 (Sat, 02 May 2009) | 1 line
........
r72303 | benjamin.peterson | 2009-05-04 19:55:24 -0500 (Mon, 04 May 2009) | 1 line
using sys._getframe(x), where x > 0 doesnt' work on IronPython
........
r72434 | r.david.murray | 2009-05-07 13:09:58 -0500 (Thu, 07 May 2009) | 2 lines
Pre-opened test file needs to be opened in binary mode.
........
r72467 | georg.brandl | 2009-05-08 07:17:34 -0500 (Fri, 08 May 2009) | 1 line
Fix name.
........
r72476 | thomas.heller | 2009-05-08 15:09:40 -0500 (Fri, 08 May 2009) | 4 lines
Add a file that contains diffs between offical libffi files and the
files in this repository. Should make it easier to merge new libffi
versions.
........
2009-05-08 17:42:26 -03:00
|
|
|
|
2015-10-06 23:36:54 -03:00
|
|
|
def test_unsubclassable_types(self):
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(type(None)):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(object, type(None)):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(type(None), object):
|
|
|
|
pass
|
|
|
|
class O(object):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(O, type(None)):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(type(None), O):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class X(object):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
X.__bases__ = type(None),
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
X.__bases__ = object, type(None)
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
X.__bases__ = type(None), object
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
X.__bases__ = O, type(None)
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
X.__bases__ = type(None), O
|
2009-04-18 17:54:08 -03:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_mutable_bases_with_failing_mro(self):
|
|
|
|
# Testing mutable bases with failing mro...
|
|
|
|
class WorkOnce(type):
|
|
|
|
def __new__(self, name, bases, ns):
|
|
|
|
self.flag = 0
|
|
|
|
return super(WorkOnce, self).__new__(WorkOnce, name, bases, ns)
|
|
|
|
def mro(self):
|
|
|
|
if self.flag > 0:
|
|
|
|
raise RuntimeError("bozo")
|
|
|
|
else:
|
|
|
|
self.flag += 1
|
|
|
|
return type.mro(self)
|
|
|
|
|
|
|
|
class WorkAlways(type):
|
|
|
|
def mro(self):
|
|
|
|
# this is here to make sure that .mro()s aren't called
|
|
|
|
# with an exception set (which was possible at one point).
|
|
|
|
# An error message will be printed in a debug build.
|
|
|
|
# What's a good way to test for this?
|
|
|
|
return type.mro(self)
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class C2(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class E(D):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class F(D, metaclass=WorkOnce):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class G(D, metaclass=WorkAlways):
|
|
|
|
pass
|
|
|
|
|
|
|
|
# Immediate subclasses have their mro's adjusted in alphabetical
|
|
|
|
# order, so E's will get adjusted before adjusting F's fails. We
|
|
|
|
# check here that E's gets restored.
|
|
|
|
|
|
|
|
E_mro_before = E.__mro__
|
|
|
|
D_mro_before = D.__mro__
|
|
|
|
|
2001-10-26 01:26:12 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
D.__bases__ = (C2,)
|
|
|
|
except RuntimeError:
|
|
|
|
self.assertEqual(E.__mro__, E_mro_before)
|
|
|
|
self.assertEqual(D.__mro__, D_mro_before)
|
|
|
|
else:
|
|
|
|
self.fail("exception not propagated")
|
|
|
|
|
|
|
|
def test_mutable_bases_catch_mro_conflict(self):
|
|
|
|
# Testing mutable bases catch mro conflict...
|
|
|
|
class A(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class B(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class C(A, B):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class D(A, B):
|
|
|
|
pass
|
|
|
|
|
|
|
|
class E(C, D):
|
|
|
|
pass
|
|
|
|
|
|
|
|
try:
|
|
|
|
C.__bases__ = (B, A)
|
|
|
|
except TypeError:
|
2001-10-26 01:26:12 -03:00
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("didn't catch MRO conflict")
|
|
|
|
|
|
|
|
def test_mutable_names(self):
|
|
|
|
# Testing mutable names...
|
|
|
|
class C(object):
|
|
|
|
pass
|
|
|
|
|
|
|
|
# C.__module__ could be 'test_descr' or '__main__'
|
|
|
|
mod = C.__module__
|
|
|
|
|
|
|
|
C.__name__ = 'D'
|
|
|
|
self.assertEqual((C.__module__, C.__name__), (mod, 'D'))
|
|
|
|
|
|
|
|
C.__name__ = 'D.E'
|
|
|
|
self.assertEqual((C.__module__, C.__name__), (mod, 'D.E'))
|
|
|
|
|
2013-04-13 11:26:58 -03:00
|
|
|
def test_evil_type_name(self):
|
|
|
|
# A badly placed Py_DECREF in type_set_name led to arbitrary code
|
|
|
|
# execution while the type structure was not in a sane state, and a
|
|
|
|
# possible segmentation fault as a result. See bug #16447.
|
|
|
|
class Nasty(str):
|
|
|
|
def __del__(self):
|
|
|
|
C.__name__ = "other"
|
|
|
|
|
|
|
|
class C:
|
|
|
|
pass
|
|
|
|
|
|
|
|
C.__name__ = Nasty("abc")
|
|
|
|
C.__name__ = "normal"
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_subclass_right_op(self):
|
|
|
|
# Testing correct dispatch of subclass overloading __r<op>__...
|
|
|
|
|
|
|
|
# This code tests various cases where right-dispatch of a subclass
|
|
|
|
# should be preferred over left-dispatch of a base class.
|
|
|
|
|
|
|
|
# Case 1: subclass of int; this tests code in abstract.c::binary_op1()
|
|
|
|
|
|
|
|
class B(int):
|
|
|
|
def __floordiv__(self, other):
|
|
|
|
return "B.__floordiv__"
|
|
|
|
def __rfloordiv__(self, other):
|
|
|
|
return "B.__rfloordiv__"
|
|
|
|
|
|
|
|
self.assertEqual(B(1) // 1, "B.__floordiv__")
|
|
|
|
self.assertEqual(1 // B(1), "B.__rfloordiv__")
|
|
|
|
|
|
|
|
# Case 2: subclass of object; this is just the baseline for case 3
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
def __floordiv__(self, other):
|
|
|
|
return "C.__floordiv__"
|
|
|
|
def __rfloordiv__(self, other):
|
|
|
|
return "C.__rfloordiv__"
|
|
|
|
|
|
|
|
self.assertEqual(C() // 1, "C.__floordiv__")
|
|
|
|
self.assertEqual(1 // C(), "C.__rfloordiv__")
|
|
|
|
|
|
|
|
# Case 3: subclass of new-style class; here it gets interesting
|
|
|
|
|
|
|
|
class D(C):
|
|
|
|
def __floordiv__(self, other):
|
|
|
|
return "D.__floordiv__"
|
|
|
|
def __rfloordiv__(self, other):
|
|
|
|
return "D.__rfloordiv__"
|
|
|
|
|
|
|
|
self.assertEqual(D() // C(), "D.__floordiv__")
|
|
|
|
self.assertEqual(C() // D(), "D.__rfloordiv__")
|
|
|
|
|
|
|
|
# Case 4: this didn't work right in 2.2.2 and 2.3a1
|
|
|
|
|
|
|
|
class E(C):
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.assertEqual(E.__rfloordiv__, C.__rfloordiv__)
|
|
|
|
|
|
|
|
self.assertEqual(E() // 1, "C.__floordiv__")
|
|
|
|
self.assertEqual(1 // E(), "C.__rfloordiv__")
|
|
|
|
self.assertEqual(E() // C(), "C.__floordiv__")
|
|
|
|
self.assertEqual(C() // E(), "C.__floordiv__") # This one would fail
|
|
|
|
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
@support.impl_detail("testing an internal kind of method object")
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_meth_class_get(self):
|
|
|
|
# Testing __get__ method of METH_CLASS C methods...
|
|
|
|
# Full coverage of descrobject.c::classmethod_get()
|
|
|
|
|
|
|
|
# Baseline
|
|
|
|
arg = [1, 2, 3]
|
|
|
|
res = {1: None, 2: None, 3: None}
|
|
|
|
self.assertEqual(dict.fromkeys(arg), res)
|
|
|
|
self.assertEqual({}.fromkeys(arg), res)
|
|
|
|
|
|
|
|
# Now get the descriptor
|
|
|
|
descr = dict.__dict__["fromkeys"]
|
|
|
|
|
|
|
|
# More baseline using the descriptor directly
|
|
|
|
self.assertEqual(descr.__get__(None, dict)(arg), res)
|
|
|
|
self.assertEqual(descr.__get__({})(arg), res)
|
|
|
|
|
|
|
|
# Now check various error cases
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
descr.__get__(None, None)
|
|
|
|
except TypeError:
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't have allowed descr.__get__(None, None)")
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
descr.__get__(42)
|
|
|
|
except TypeError:
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't have allowed descr.__get__(42)")
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
descr.__get__(None, 42)
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't have allowed descr.__get__(None, 42)")
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
descr.__get__(None, int)
|
|
|
|
except TypeError:
|
Merged revisions 55325-55327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
Don't use err.message, use err.args[0].
................
r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
Merged revisions 54988-55226,55228-55323 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
This gets the test working on Solaris. It seems a little hokey to me,
but the test passed on Linux and Solaris, hopefully other platforms too.
........
r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
Version fix (bug #1708710)
........
r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
There really are some tests that are problematic.
........
r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.
........
r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
Make sure to call PyErr_NoMemory() in several places where
PyMem_Malloc() could potentially fail.
Will backport to the release25-maint branch.
........
r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
When accessing the .value attribute of a c_wchar_p instance, and the
instance does not point to a valid wchar_t zero-terminated string,
raise a ValueError. c_char_p does this already.
The ValueError message now contains the correct pointer address.
Will backport to release25-maint.
........
r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
Bug #1710295: exceptions are now new-style classes.
........
r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
Patch #1710352: add missing public functions to locale.__all__.
........
r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
........
r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
Added documentation for new optional credentials argument to SMTPHandler.__init__().
........
r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
Stop using PyMem_FREE while the GIL is not held. For details see:
http://mail.python.org/pipermail/python-dev/2007-May/072896.html
........
r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
Fix for #1303614 and #1174712:
- __dict__ descriptor abuse for subclasses of built-in types
- subclassing from both ModuleType and another built-in types
Thanks zseil for the patch.
........
r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
Actually raise an exception before calling ast_error_finish.
Triggers an assertion otherwise.
........
r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
Handle a couple of uncaught errors. This should be backported
........
r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
Remove dead code. This code couldn't be reached because earlier in
the function there is another check for z != Py_None.
........
r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
Fix building _ctypes.pyd for x64 / Windows.
........
r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
Don't truncate pointers to integers (on win64 platform).
........
r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
in native order mode, and only if it's the first two bytes.
........
r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
........
r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64. Now the testsuite is well behaved on that platform.
........
r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
Fix problems in x64 build that were discovered by the testsuite:
- Reenable modules on x64 that had been disabled aeons ago for Itanium.
- Cleared up confusion about compilers for 64 bit windows. There is only Itanium and x64. Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
- Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
- Fixed thread_nt.h. The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier. Anyway, win95 is no longer a target platform.
- Itertools module used wrong constant to check for overflow in count()
- PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
- PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
With these changes, the x64 passes the testsuite, for those modules present.
........
r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
Revert compiler comment to AMD64 for x64/AMD64 builds.
........
r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
Fix some ctypes test crashes, when running with a debug Python
version on win64 by using proper argtypes and restype function
attributes.
........
r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
On 64-bit Windows, ffi_arg must be 8 bytes long. This fixes the
remaining crashes in the ctypes tests, when functions return float or
double types.
........
r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
Update the pcbuild8 solution. Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
........
r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
........
r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
Do not truncate 64-bit pointers to 32-bit integers.
Fixes SF #1703286, will backport to release25-maint.
........
r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
Oops, these tests do not run on Windows CE.
........
r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
Deprecate BaseException.message as per PEP 352.
........
r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
Bug #1713535: typo in logging example.
........
r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
Updates of recent changes to logging.
........
r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
Verify changes to the trunk go to the normal checkins list
........
r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol. The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
........
r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
Fix a bug in test.test_support.open_urlresource().
If the call to requires() doesn't precede the filesystem check, we get the following situation:
1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
3. ./python Lib/test/regrtest.py test_foo # test runs (!)
By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
........
r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
Add markup for True/False. Will backport
........
r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
Backport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
instead of memchr().
........
r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
Don't ever report a failure when the sum of the reference count differences
are zero. This should help reduce the false positives.
The message about references leaking is maintained to provide as much
info as possible rather than simply suppressing the message at the source.
........
r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
Fix typo in docstring (the module is popen2, not 3).
........
r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
Remove trailing whitespace in docstring
........
r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module.
........
r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
........
r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
Remove an XXX that is unnecessary.
........
r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
(backport)
........
r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
Update DDJ link.
........
r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
Better tests for posixpath.commonprefix
........
r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
Bug #1046945: document SWIG options of distutils.
........
r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
Add bz2 to content encodings.
........
r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
Hopefully Guido won't shed a tear. :-)
........
r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
Remove references to stdwin which was removed long ago.
........
r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
Remove support for freebsd[23] which haven't been released since 2000
or earlier. http://www.freebsd.org/releases/index.html
........
r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
Small speedup.
........
................
2007-05-14 19:51:27 -03:00
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("shouldn't have allowed descr.__get__(None, int)")
|
|
|
|
|
|
|
|
def test_isinst_isclass(self):
|
|
|
|
# Testing proxy isinstance() and isclass()...
|
|
|
|
class Proxy(object):
|
|
|
|
def __init__(self, obj):
|
|
|
|
self.__obj = obj
|
|
|
|
def __getattribute__(self, name):
|
|
|
|
if name.startswith("_Proxy__"):
|
|
|
|
return object.__getattribute__(self, name)
|
|
|
|
else:
|
|
|
|
return getattr(self.__obj, name)
|
|
|
|
# Test with a classic class
|
|
|
|
class C:
|
|
|
|
pass
|
|
|
|
a = C()
|
|
|
|
pa = Proxy(a)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(a, C) # Baseline
|
|
|
|
self.assertIsInstance(pa, C) # Test
|
2008-02-05 14:13:15 -04:00
|
|
|
# Test with a classic subclass
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
a = D()
|
|
|
|
pa = Proxy(a)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(a, C) # Baseline
|
|
|
|
self.assertIsInstance(pa, C) # Test
|
2008-02-05 14:13:15 -04:00
|
|
|
# Test with a new-style class
|
|
|
|
class C(object):
|
|
|
|
pass
|
|
|
|
a = C()
|
|
|
|
pa = Proxy(a)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(a, C) # Baseline
|
|
|
|
self.assertIsInstance(pa, C) # Test
|
2008-02-05 14:13:15 -04:00
|
|
|
# Test with a new-style subclass
|
2002-03-14 19:05:54 -04:00
|
|
|
class D(C):
|
|
|
|
pass
|
2008-02-05 14:13:15 -04:00
|
|
|
a = D()
|
|
|
|
pa = Proxy(a)
|
2010-01-24 15:26:24 -04:00
|
|
|
self.assertIsInstance(a, C) # Baseline
|
|
|
|
self.assertIsInstance(pa, C) # Test
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_proxy_super(self):
|
|
|
|
# Testing super() for a proxy object...
|
|
|
|
class Proxy(object):
|
|
|
|
def __init__(self, obj):
|
|
|
|
self.__obj = obj
|
|
|
|
def __getattribute__(self, name):
|
|
|
|
if name.startswith("_Proxy__"):
|
|
|
|
return object.__getattribute__(self, name)
|
|
|
|
else:
|
|
|
|
return getattr(self.__obj, name)
|
|
|
|
|
|
|
|
class B(object):
|
|
|
|
def f(self):
|
|
|
|
return "B.f"
|
|
|
|
|
|
|
|
class C(B):
|
|
|
|
def f(self):
|
|
|
|
return super(C, self).f() + "->C.f"
|
|
|
|
|
|
|
|
obj = C()
|
|
|
|
p = Proxy(obj)
|
|
|
|
self.assertEqual(C.__dict__["f"](p), "B.f->C.f")
|
|
|
|
|
|
|
|
def test_carloverre(self):
|
|
|
|
# Testing prohibition of Carlo Verre's hack...
|
2002-03-14 19:05:54 -04:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
object.__setattr__(str, "foo", 42)
|
2002-03-14 19:05:54 -04:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2011-03-16 06:05:33 -03:00
|
|
|
self.fail("Carlo Verre __setattr__ succeeded!")
|
2002-03-14 19:05:54 -04:00
|
|
|
try:
|
2008-02-05 14:13:15 -04:00
|
|
|
object.__delattr__(str, "lower")
|
2002-03-14 19:05:54 -04:00
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
2008-02-05 14:13:15 -04:00
|
|
|
self.fail("Carlo Verre __delattr__ succeeded!")
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2020-07-18 18:19:50 -03:00
|
|
|
def test_carloverre_multi_inherit_valid(self):
|
|
|
|
class A(type):
|
|
|
|
def __setattr__(cls, key, value):
|
|
|
|
type.__setattr__(cls, key, value)
|
|
|
|
|
|
|
|
class B:
|
|
|
|
pass
|
|
|
|
|
|
|
|
class C(B, A):
|
|
|
|
pass
|
|
|
|
|
|
|
|
obj = C('D', (object,), {})
|
|
|
|
try:
|
|
|
|
obj.test = True
|
|
|
|
except TypeError:
|
|
|
|
self.fail("setattr through direct base types should be legal")
|
|
|
|
|
|
|
|
def test_carloverre_multi_inherit_invalid(self):
|
|
|
|
class A(type):
|
|
|
|
def __setattr__(cls, key, value):
|
|
|
|
object.__setattr__(cls, key, value) # this should fail!
|
|
|
|
|
|
|
|
class B:
|
|
|
|
pass
|
|
|
|
|
|
|
|
class C(B, A):
|
|
|
|
pass
|
|
|
|
|
|
|
|
obj = C('D', (object,), {})
|
|
|
|
try:
|
|
|
|
obj.test = True
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("setattr through indirect base types should be rejected")
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_weakref_segfault(self):
|
|
|
|
# Testing weakref segfault...
|
|
|
|
# SF 742911
|
|
|
|
import weakref
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class Provoker:
|
|
|
|
def __init__(self, referrent):
|
|
|
|
self.ref = weakref.ref(referrent)
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def __del__(self):
|
|
|
|
x = self.ref()
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class Oops(object):
|
|
|
|
pass
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
o = Oops()
|
|
|
|
o.whatever = Provoker(o)
|
|
|
|
del o
|
|
|
|
|
2023-09-02 01:45:34 -03:00
|
|
|
@support.requires_resource('cpu')
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_wrapper_segfault(self):
|
|
|
|
# SF 927248: deeply nested wrappers could cause stack overflow
|
|
|
|
f = lambda:None
|
|
|
|
for i in range(1000000):
|
|
|
|
f = f.__call__
|
|
|
|
f = None
|
|
|
|
|
|
|
|
def test_file_fault(self):
|
|
|
|
# Testing sys.stdout is changed in getattr...
|
|
|
|
class StdoutGuard:
|
|
|
|
def __getattr__(self, attr):
|
|
|
|
sys.stdout = sys.__stdout__
|
2022-01-08 04:14:40 -04:00
|
|
|
raise RuntimeError(f"Premature access to sys.stdout.{attr}")
|
|
|
|
|
|
|
|
with redirect_stdout(StdoutGuard()):
|
2022-04-17 15:04:29 -03:00
|
|
|
with self.assertRaises(RuntimeError):
|
|
|
|
print("Oops!")
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_vicious_descriptor_nonsense(self):
|
|
|
|
# Testing vicious_descriptor_nonsense...
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
# A potential segfault spotted by Thomas Wouters in mail to
|
|
|
|
# python-dev 2003-04-17, turned into an example & fixed by Michael
|
|
|
|
# Hudson just less than four months later...
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class Evil(object):
|
|
|
|
def __hash__(self):
|
|
|
|
return hash('attr')
|
|
|
|
def __eq__(self, other):
|
2019-02-26 02:03:21 -04:00
|
|
|
try:
|
|
|
|
del C.attr
|
|
|
|
except AttributeError:
|
|
|
|
# possible race condition
|
|
|
|
pass
|
2008-02-05 14:13:15 -04:00
|
|
|
return 0
|
2002-12-24 14:31:27 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class Descr(object):
|
|
|
|
def __get__(self, ob, type=None):
|
|
|
|
return 1
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class C(object):
|
|
|
|
attr = Descr()
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
c = C()
|
|
|
|
c.__dict__[Evil()] = 0
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(c.attr, 1)
|
|
|
|
# this makes a crash more likely:
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
support.gc_collect()
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertNotHasAttr(c, 'attr')
|
2002-11-27 11:20:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_init(self):
|
|
|
|
# SF 1155938
|
|
|
|
class Foo(object):
|
|
|
|
def __init__(self):
|
|
|
|
return 10
|
|
|
|
try:
|
|
|
|
Foo()
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("did not test __init__() for None return")
|
|
|
|
|
2018-07-31 03:18:24 -03:00
|
|
|
def assertNotOrderable(self, a, b):
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
a < b
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
a > b
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
a <= b
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
a >= b
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_method_wrapper(self):
|
|
|
|
# Testing method-wrapper objects...
|
|
|
|
# <type 'method-wrapper'> did not support any reflection before 2.5
|
|
|
|
l = []
|
2018-07-31 03:18:24 -03:00
|
|
|
self.assertTrue(l.__add__ == l.__add__)
|
|
|
|
self.assertFalse(l.__add__ != l.__add__)
|
|
|
|
self.assertFalse(l.__add__ == [].__add__)
|
|
|
|
self.assertTrue(l.__add__ != [].__add__)
|
|
|
|
self.assertFalse(l.__add__ == l.__mul__)
|
|
|
|
self.assertTrue(l.__add__ != l.__mul__)
|
|
|
|
self.assertNotOrderable(l.__add__, l.__add__)
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertEqual(l.__add__.__name__, '__add__')
|
2018-07-31 03:18:24 -03:00
|
|
|
self.assertIs(l.__add__.__self__, l)
|
|
|
|
self.assertIs(l.__add__.__objclass__, list)
|
2008-02-05 14:13:15 -04:00
|
|
|
self.assertEqual(l.__add__.__doc__, list.__add__.__doc__)
|
2018-07-31 03:18:24 -03:00
|
|
|
# hash([].__add__) should not be based on hash([])
|
|
|
|
hash(l.__add__)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2018-07-31 03:18:24 -03:00
|
|
|
def test_builtin_function_or_method(self):
|
|
|
|
# Not really belonging to test_descr, but introspection and
|
|
|
|
# comparison on <type 'builtin_function_or_method'> seems not
|
|
|
|
# to be tested elsewhere
|
|
|
|
l = []
|
|
|
|
self.assertTrue(l.append == l.append)
|
|
|
|
self.assertFalse(l.append != l.append)
|
|
|
|
self.assertFalse(l.append == [].append)
|
|
|
|
self.assertTrue(l.append != [].append)
|
|
|
|
self.assertFalse(l.append == l.pop)
|
|
|
|
self.assertTrue(l.append != l.pop)
|
|
|
|
self.assertNotOrderable(l.append, l.append)
|
|
|
|
self.assertEqual(l.append.__name__, 'append')
|
|
|
|
self.assertIs(l.append.__self__, l)
|
|
|
|
# self.assertIs(l.append.__objclass__, list) --- could be added?
|
|
|
|
self.assertEqual(l.append.__doc__, list.append.__doc__)
|
|
|
|
# hash([].append) should not be based on hash([])
|
|
|
|
hash(l.append)
|
|
|
|
|
|
|
|
def test_special_unbound_method_types(self):
|
|
|
|
# Testing objects of <type 'wrapper_descriptor'>...
|
|
|
|
self.assertTrue(list.__add__ == list.__add__)
|
|
|
|
self.assertFalse(list.__add__ != list.__add__)
|
|
|
|
self.assertFalse(list.__add__ == list.__mul__)
|
|
|
|
self.assertTrue(list.__add__ != list.__mul__)
|
|
|
|
self.assertNotOrderable(list.__add__, list.__add__)
|
|
|
|
self.assertEqual(list.__add__.__name__, '__add__')
|
|
|
|
self.assertIs(list.__add__.__objclass__, list)
|
|
|
|
|
|
|
|
# Testing objects of <type 'method_descriptor'>...
|
|
|
|
self.assertTrue(list.append == list.append)
|
|
|
|
self.assertFalse(list.append != list.append)
|
|
|
|
self.assertFalse(list.append == list.pop)
|
|
|
|
self.assertTrue(list.append != list.pop)
|
|
|
|
self.assertNotOrderable(list.append, list.append)
|
|
|
|
self.assertEqual(list.append.__name__, 'append')
|
|
|
|
self.assertIs(list.append.__objclass__, list)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_not_implemented(self):
|
|
|
|
# Testing NotImplemented...
|
|
|
|
# all binary methods should be able to return a NotImplemented
|
|
|
|
import operator
|
2005-12-29 11:59:19 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def specialmethod(self, other):
|
|
|
|
return NotImplemented
|
|
|
|
|
|
|
|
def check(expr, x, y):
|
|
|
|
try:
|
|
|
|
exec(expr, {'x': x, 'y': y, 'operator': operator})
|
|
|
|
except TypeError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("no TypeError from %r" % (expr,))
|
|
|
|
|
|
|
|
N1 = sys.maxsize + 1 # might trigger OverflowErrors instead of
|
|
|
|
# TypeErrors
|
|
|
|
N2 = sys.maxsize # if sizeof(int) < sizeof(long), might trigger
|
|
|
|
# ValueErrors instead of TypeErrors
|
2005-12-29 11:59:19 -04:00
|
|
|
for name, expr, iexpr in [
|
|
|
|
('__add__', 'x + y', 'x += y'),
|
|
|
|
('__sub__', 'x - y', 'x -= y'),
|
|
|
|
('__mul__', 'x * y', 'x *= y'),
|
2014-04-10 00:55:56 -03:00
|
|
|
('__matmul__', 'x @ y', 'x @= y'),
|
2015-03-12 16:56:08 -03:00
|
|
|
('__truediv__', 'x / y', 'x /= y'),
|
|
|
|
('__floordiv__', 'x // y', 'x //= y'),
|
2005-12-29 11:59:19 -04:00
|
|
|
('__mod__', 'x % y', 'x %= y'),
|
|
|
|
('__divmod__', 'divmod(x, y)', None),
|
|
|
|
('__pow__', 'x ** y', 'x **= y'),
|
|
|
|
('__lshift__', 'x << y', 'x <<= y'),
|
|
|
|
('__rshift__', 'x >> y', 'x >>= y'),
|
|
|
|
('__and__', 'x & y', 'x &= y'),
|
|
|
|
('__or__', 'x | y', 'x |= y'),
|
2008-02-05 14:13:15 -04:00
|
|
|
('__xor__', 'x ^ y', 'x ^= y')]:
|
2006-08-21 14:06:07 -03:00
|
|
|
rname = '__r' + name[2:]
|
2008-02-05 14:13:15 -04:00
|
|
|
A = type('A', (), {name: specialmethod})
|
2005-12-29 11:59:19 -04:00
|
|
|
a = A()
|
|
|
|
check(expr, a, a)
|
|
|
|
check(expr, a, N1)
|
|
|
|
check(expr, a, N2)
|
|
|
|
if iexpr:
|
|
|
|
check(iexpr, a, a)
|
|
|
|
check(iexpr, a, N1)
|
|
|
|
check(iexpr, a, N2)
|
|
|
|
iname = '__i' + name[2:]
|
2008-02-05 14:13:15 -04:00
|
|
|
C = type('C', (), {iname: specialmethod})
|
2005-12-29 11:59:19 -04:00
|
|
|
c = C()
|
|
|
|
check(iexpr, c, a)
|
|
|
|
check(iexpr, c, N1)
|
|
|
|
check(iexpr, c, N2)
|
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_assign_slice(self):
|
|
|
|
# ceval.c's assign_slice used to check for
|
|
|
|
# tp->tp_as_sequence->sq_slice instead of
|
|
|
|
# tp->tp_as_sequence->sq_ass_slice
|
|
|
|
|
|
|
|
class C(object):
|
|
|
|
def __setitem__(self, idx, value):
|
|
|
|
self.value = value
|
|
|
|
|
|
|
|
c = C()
|
|
|
|
c[1:2] = 3
|
|
|
|
self.assertEqual(c.value, 3)
|
|
|
|
|
Merged revisions 77484,77487,77561,77570,77593,77603,77608,77667,77702-77703,77739,77858,77887,77889 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77484 | skip.montanaro | 2010-01-13 19:12:34 -0600 (Wed, 13 Jan 2010) | 4 lines
Update PyEval_EvalFrame to PyEval_EvalFrameEx. This looks to have been done
partially before. Also add a comment describing how this might have to work
with different versions of the interpreter.
........
r77487 | ezio.melotti | 2010-01-14 05:34:10 -0600 (Thu, 14 Jan 2010) | 1 line
Fixed typo
........
r77561 | georg.brandl | 2010-01-17 02:42:30 -0600 (Sun, 17 Jan 2010) | 1 line
#7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such.
........
r77570 | georg.brandl | 2010-01-17 06:14:42 -0600 (Sun, 17 Jan 2010) | 1 line
Add note about usage of STRINGLIB_EMPTY.
........
r77593 | georg.brandl | 2010-01-17 17:33:53 -0600 (Sun, 17 Jan 2010) | 1 line
Fix internal reference.
........
r77603 | benjamin.peterson | 2010-01-18 17:07:56 -0600 (Mon, 18 Jan 2010) | 8 lines
data descriptors do not override the class dictionary if __get__ is not defined
Adjust documentation and add a test to verify this behavior.
See http://mail.python.org/pipermail/python-dev/2010-January/095637.html for
discussion.
........
r77608 | gregory.p.smith | 2010-01-19 02:19:03 -0600 (Tue, 19 Jan 2010) | 6 lines
Do not compile stubs for the sha2 series hashes in the openssl hashlib
module when the openssl version is too old to support them. That
leads both compiled code bloat and to unittests attempting to test
implementations that don't exist for comparison purposes on such
platforms.
........
r77667 | mark.dickinson | 2010-01-21 12:32:27 -0600 (Thu, 21 Jan 2010) | 1 line
Add two more test_strtod test values.
........
r77702 | georg.brandl | 2010-01-23 02:43:31 -0600 (Sat, 23 Jan 2010) | 1 line
#7762: fix refcount annotation of PyUnicode_Tailmatch().
........
r77703 | georg.brandl | 2010-01-23 02:47:54 -0600 (Sat, 23 Jan 2010) | 1 line
#7725: fix referencing issue.
........
r77739 | benjamin.peterson | 2010-01-24 21:52:52 -0600 (Sun, 24 Jan 2010) | 1 line
mention from_float() in error message
........
r77858 | georg.brandl | 2010-01-30 11:57:48 -0600 (Sat, 30 Jan 2010) | 1 line
#7802: fix invalid example (heh).
........
r77887 | georg.brandl | 2010-01-31 12:51:49 -0600 (Sun, 31 Jan 2010) | 5 lines
Fix-up ftplib documentation:
move exception descriptions to toplevel, not inside a class
remove attribution in "versionadded"
spell and grammar check docstring of FTP_TLS
........
r77889 | michael.foord | 2010-01-31 13:59:26 -0600 (Sun, 31 Jan 2010) | 1 line
Minor modification to unittest documentation.
........
2010-02-02 22:35:45 -04:00
|
|
|
def test_set_and_no_get(self):
|
|
|
|
# See
|
|
|
|
# http://mail.python.org/pipermail/python-dev/2010-January/095637.html
|
|
|
|
class Descr(object):
|
|
|
|
|
|
|
|
def __init__(self, name):
|
|
|
|
self.name = name
|
|
|
|
|
|
|
|
def __set__(self, obj, value):
|
|
|
|
obj.__dict__[self.name] = value
|
|
|
|
descr = Descr("a")
|
|
|
|
|
|
|
|
class X(object):
|
|
|
|
a = descr
|
|
|
|
|
|
|
|
x = X()
|
|
|
|
self.assertIs(x.a, descr)
|
|
|
|
x.a = 42
|
|
|
|
self.assertEqual(x.a, 42)
|
|
|
|
|
Merged revisions 77952,78030,78102,78104,78107,78206,78216,78296-78297,78328,78331-78332,78336,78339,78343,78378-78379,78415,78559,78717,78791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77952 | mark.dickinson | 2010-02-03 10:50:14 -0600 (Wed, 03 Feb 2010) | 1 line
Fix test_inspect.py data to match recent change to inspect_fodder.py (r77942).
........
r78030 | benjamin.peterson | 2010-02-06 14:14:10 -0600 (Sat, 06 Feb 2010) | 1 line
check type_getattro for correctness in a descriptor corner case
........
r78102 | andrew.kuchling | 2010-02-07 19:35:35 -0600 (Sun, 07 Feb 2010) | 1 line
Move distutils into its own subsection; add various items
........
r78104 | andrew.kuchling | 2010-02-08 07:22:24 -0600 (Mon, 08 Feb 2010) | 1 line
Add two items; move a subsection
........
r78107 | antoine.pitrou | 2010-02-08 14:25:47 -0600 (Mon, 08 Feb 2010) | 3 lines
Clarify and correct description for ccbench and iobench.
........
r78206 | r.david.murray | 2010-02-16 11:55:26 -0600 (Tue, 16 Feb 2010) | 3 lines
Make the references to Popen in the description of Call
and check_call into links.
........
r78216 | andrew.kuchling | 2010-02-18 08:16:48 -0600 (Thu, 18 Feb 2010) | 1 line
Add various items
........
r78296 | andrew.kuchling | 2010-02-21 20:08:45 -0600 (Sun, 21 Feb 2010) | 1 line
Re-word
........
r78297 | andrew.kuchling | 2010-02-21 20:29:10 -0600 (Sun, 21 Feb 2010) | 1 line
#7076: mention SystemRandom class near start of the module docs; reword change description for clarity. Noted by Shawn Ligocki.
........
r78328 | jack.diederich | 2010-02-22 12:17:16 -0600 (Mon, 22 Feb 2010) | 1 line
fixes issue #7530, serve_forever()
........
r78331 | andrew.kuchling | 2010-02-22 12:38:23 -0600 (Mon, 22 Feb 2010) | 1 line
Fix comment typo
........
r78332 | andrew.kuchling | 2010-02-22 12:42:07 -0600 (Mon, 22 Feb 2010) | 2 lines
#7627: MH.remove() would fail if the MH mailbox was locked;
it would call _unlock_file() and pass it a closed file object. Noted by Rob Austein.
........
r78336 | jack.diederich | 2010-02-22 13:55:22 -0600 (Mon, 22 Feb 2010) | 1 line
fixes issue #1522237, bad init check in _threading_local
........
r78339 | jack.diederich | 2010-02-22 15:27:38 -0600 (Mon, 22 Feb 2010) | 1 line
* fix issue#7476
........
r78343 | andrew.kuchling | 2010-02-22 16:48:41 -0600 (Mon, 22 Feb 2010) | 10 lines
#2560: remove an unnecessary 'for' loop from my_fgets() in Parser/myreadline.c.
Noted by Joseph Armbruster; patch by Jessica McKellar.
The original code was 'for (;;) {...}', where ... ended
with a 'return -2' statement and did not contain a 'break' or 'continue'
statement. Therefore, the body of the loop is always executed once.
Once upon a time there was a 'continue' in the loop, but it was removed in
rev36346, committed by mwh on Wed Jul 7 17:44:12 2004.
........
r78378 | jack.diederich | 2010-02-23 11:23:30 -0600 (Tue, 23 Feb 2010) | 1 line
fixup markup error
........
r78379 | jack.diederich | 2010-02-23 13:34:06 -0600 (Tue, 23 Feb 2010) | 1 line
issue#6442 use in operator instead of has_key
........
r78415 | dirkjan.ochtman | 2010-02-23 22:00:52 -0600 (Tue, 23 Feb 2010) | 1 line
Issue #7733: add explicit reference in asyncore docs.
........
r78559 | andrew.kuchling | 2010-03-01 13:45:21 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: update discussion of minidom.unlink() and garbage collection
........
r78717 | benjamin.peterson | 2010-03-05 21:13:33 -0600 (Fri, 05 Mar 2010) | 1 line
settscdump is definitely an implementation detail
........
r78791 | andrew.kuchling | 2010-03-08 06:00:39 -0600 (Mon, 08 Mar 2010) | 1 line
Add various items
........
2010-03-21 19:03:03 -03:00
|
|
|
# Also check type_getattro for correctness.
|
|
|
|
class Meta(type):
|
|
|
|
pass
|
2015-03-12 16:56:08 -03:00
|
|
|
class X(metaclass=Meta):
|
|
|
|
pass
|
Merged revisions 77952,78030,78102,78104,78107,78206,78216,78296-78297,78328,78331-78332,78336,78339,78343,78378-78379,78415,78559,78717,78791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77952 | mark.dickinson | 2010-02-03 10:50:14 -0600 (Wed, 03 Feb 2010) | 1 line
Fix test_inspect.py data to match recent change to inspect_fodder.py (r77942).
........
r78030 | benjamin.peterson | 2010-02-06 14:14:10 -0600 (Sat, 06 Feb 2010) | 1 line
check type_getattro for correctness in a descriptor corner case
........
r78102 | andrew.kuchling | 2010-02-07 19:35:35 -0600 (Sun, 07 Feb 2010) | 1 line
Move distutils into its own subsection; add various items
........
r78104 | andrew.kuchling | 2010-02-08 07:22:24 -0600 (Mon, 08 Feb 2010) | 1 line
Add two items; move a subsection
........
r78107 | antoine.pitrou | 2010-02-08 14:25:47 -0600 (Mon, 08 Feb 2010) | 3 lines
Clarify and correct description for ccbench and iobench.
........
r78206 | r.david.murray | 2010-02-16 11:55:26 -0600 (Tue, 16 Feb 2010) | 3 lines
Make the references to Popen in the description of Call
and check_call into links.
........
r78216 | andrew.kuchling | 2010-02-18 08:16:48 -0600 (Thu, 18 Feb 2010) | 1 line
Add various items
........
r78296 | andrew.kuchling | 2010-02-21 20:08:45 -0600 (Sun, 21 Feb 2010) | 1 line
Re-word
........
r78297 | andrew.kuchling | 2010-02-21 20:29:10 -0600 (Sun, 21 Feb 2010) | 1 line
#7076: mention SystemRandom class near start of the module docs; reword change description for clarity. Noted by Shawn Ligocki.
........
r78328 | jack.diederich | 2010-02-22 12:17:16 -0600 (Mon, 22 Feb 2010) | 1 line
fixes issue #7530, serve_forever()
........
r78331 | andrew.kuchling | 2010-02-22 12:38:23 -0600 (Mon, 22 Feb 2010) | 1 line
Fix comment typo
........
r78332 | andrew.kuchling | 2010-02-22 12:42:07 -0600 (Mon, 22 Feb 2010) | 2 lines
#7627: MH.remove() would fail if the MH mailbox was locked;
it would call _unlock_file() and pass it a closed file object. Noted by Rob Austein.
........
r78336 | jack.diederich | 2010-02-22 13:55:22 -0600 (Mon, 22 Feb 2010) | 1 line
fixes issue #1522237, bad init check in _threading_local
........
r78339 | jack.diederich | 2010-02-22 15:27:38 -0600 (Mon, 22 Feb 2010) | 1 line
* fix issue#7476
........
r78343 | andrew.kuchling | 2010-02-22 16:48:41 -0600 (Mon, 22 Feb 2010) | 10 lines
#2560: remove an unnecessary 'for' loop from my_fgets() in Parser/myreadline.c.
Noted by Joseph Armbruster; patch by Jessica McKellar.
The original code was 'for (;;) {...}', where ... ended
with a 'return -2' statement and did not contain a 'break' or 'continue'
statement. Therefore, the body of the loop is always executed once.
Once upon a time there was a 'continue' in the loop, but it was removed in
rev36346, committed by mwh on Wed Jul 7 17:44:12 2004.
........
r78378 | jack.diederich | 2010-02-23 11:23:30 -0600 (Tue, 23 Feb 2010) | 1 line
fixup markup error
........
r78379 | jack.diederich | 2010-02-23 13:34:06 -0600 (Tue, 23 Feb 2010) | 1 line
issue#6442 use in operator instead of has_key
........
r78415 | dirkjan.ochtman | 2010-02-23 22:00:52 -0600 (Tue, 23 Feb 2010) | 1 line
Issue #7733: add explicit reference in asyncore docs.
........
r78559 | andrew.kuchling | 2010-03-01 13:45:21 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: update discussion of minidom.unlink() and garbage collection
........
r78717 | benjamin.peterson | 2010-03-05 21:13:33 -0600 (Fri, 05 Mar 2010) | 1 line
settscdump is definitely an implementation detail
........
r78791 | andrew.kuchling | 2010-03-08 06:00:39 -0600 (Mon, 08 Mar 2010) | 1 line
Add various items
........
2010-03-21 19:03:03 -03:00
|
|
|
X.a = 42
|
|
|
|
Meta.a = Descr("a")
|
|
|
|
self.assertEqual(X.a, 42)
|
|
|
|
|
2008-11-17 18:45:50 -04:00
|
|
|
def test_getattr_hooks(self):
|
|
|
|
# issue 4230
|
|
|
|
|
|
|
|
class Descriptor(object):
|
|
|
|
counter = 0
|
|
|
|
def __get__(self, obj, objtype=None):
|
|
|
|
def getter(name):
|
|
|
|
self.counter += 1
|
|
|
|
raise AttributeError(name)
|
|
|
|
return getter
|
|
|
|
|
|
|
|
descr = Descriptor()
|
|
|
|
class A(object):
|
|
|
|
__getattribute__ = descr
|
|
|
|
class B(object):
|
|
|
|
__getattr__ = descr
|
|
|
|
class C(object):
|
|
|
|
__getattribute__ = descr
|
|
|
|
__getattr__ = descr
|
|
|
|
|
|
|
|
self.assertRaises(AttributeError, getattr, A(), "attr")
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(descr.counter, 1)
|
2008-11-17 18:45:50 -04:00
|
|
|
self.assertRaises(AttributeError, getattr, B(), "attr")
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(descr.counter, 2)
|
2008-11-17 18:45:50 -04:00
|
|
|
self.assertRaises(AttributeError, getattr, C(), "attr")
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(descr.counter, 4)
|
2008-11-17 18:45:50 -04:00
|
|
|
|
|
|
|
class EvilGetattribute(object):
|
|
|
|
# This used to segfault
|
|
|
|
def __getattr__(self, name):
|
|
|
|
raise AttributeError(name)
|
|
|
|
def __getattribute__(self, name):
|
|
|
|
del EvilGetattribute.__getattr__
|
|
|
|
for i in range(5):
|
|
|
|
gc.collect()
|
|
|
|
raise AttributeError(name)
|
|
|
|
|
|
|
|
self.assertRaises(AttributeError, getattr, EvilGetattribute(), "attr")
|
|
|
|
|
2012-03-16 11:32:59 -03:00
|
|
|
def test_type___getattribute__(self):
|
|
|
|
self.assertRaises(TypeError, type.__getattribute__, list, type)
|
|
|
|
|
2011-01-12 11:34:01 -04:00
|
|
|
def test_abstractmethods(self):
|
2011-01-12 11:25:02 -04:00
|
|
|
# type pretends not to have __abstractmethods__.
|
|
|
|
self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")
|
|
|
|
class meta(type):
|
|
|
|
pass
|
|
|
|
self.assertRaises(AttributeError, getattr, meta, "__abstractmethods__")
|
2011-01-12 11:34:01 -04:00
|
|
|
class X(object):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(AttributeError):
|
|
|
|
del X.__abstractmethods__
|
2011-01-12 11:25:02 -04:00
|
|
|
|
2024-01-28 19:05:29 -04:00
|
|
|
def test_gh55664(self):
|
|
|
|
# gh-55664: issue a warning when the
|
|
|
|
# __dict__ of a class contains non-string keys
|
|
|
|
with self.assertWarnsRegex(RuntimeWarning, 'MyClass'):
|
|
|
|
MyClass = type('MyClass', (), {1: 2})
|
|
|
|
|
|
|
|
class meta(type):
|
|
|
|
def __new__(mcls, name, bases, ns):
|
|
|
|
ns[1] = 2
|
|
|
|
return super().__new__(mcls, name, bases, ns)
|
|
|
|
|
|
|
|
with self.assertWarnsRegex(RuntimeWarning, 'MyClass'):
|
|
|
|
MyClass = meta('MyClass', (), {})
|
|
|
|
|
2011-05-01 18:19:15 -03:00
|
|
|
def test_proxy_call(self):
|
|
|
|
class FakeStr:
|
|
|
|
__class__ = str
|
|
|
|
|
|
|
|
fake_str = FakeStr()
|
|
|
|
# isinstance() reads __class__
|
2013-11-17 17:38:50 -04:00
|
|
|
self.assertIsInstance(fake_str, str)
|
2011-05-01 18:19:15 -03:00
|
|
|
|
|
|
|
# call a method descriptor
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
str.split(fake_str)
|
|
|
|
|
|
|
|
# call a slot wrapper descriptor
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
str.__add__(fake_str, "abc")
|
|
|
|
|
2022-04-30 15:35:33 -03:00
|
|
|
def test_specialized_method_calls_check_types(self):
|
|
|
|
# https://github.com/python/cpython/issues/92063
|
|
|
|
class Thing:
|
|
|
|
pass
|
|
|
|
thing = Thing()
|
|
|
|
for i in range(20):
|
|
|
|
with self.assertRaises(TypeError):
|
2023-09-13 14:25:45 -03:00
|
|
|
# CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS
|
2022-04-30 15:35:33 -03:00
|
|
|
list.sort(thing)
|
|
|
|
for i in range(20):
|
|
|
|
with self.assertRaises(TypeError):
|
2023-09-13 14:25:45 -03:00
|
|
|
# CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS
|
2022-04-30 15:35:33 -03:00
|
|
|
str.split(thing)
|
|
|
|
for i in range(20):
|
|
|
|
with self.assertRaises(TypeError):
|
2023-09-13 14:25:45 -03:00
|
|
|
# CALL_METHOD_DESCRIPTOR_NOARGS
|
2022-04-30 15:35:33 -03:00
|
|
|
str.upper(thing)
|
|
|
|
for i in range(20):
|
|
|
|
with self.assertRaises(TypeError):
|
2023-09-13 14:25:45 -03:00
|
|
|
# CALL_METHOD_DESCRIPTOR_FAST
|
2022-04-30 15:35:33 -03:00
|
|
|
str.strip(thing)
|
|
|
|
from collections import deque
|
|
|
|
for i in range(20):
|
|
|
|
with self.assertRaises(TypeError):
|
2023-09-13 14:25:45 -03:00
|
|
|
# CALL_METHOD_DESCRIPTOR_O
|
2022-04-30 15:35:33 -03:00
|
|
|
deque.append(thing, thing)
|
|
|
|
|
2011-07-15 16:15:07 -03:00
|
|
|
def test_repr_as_str(self):
|
|
|
|
# Issue #11603: crash or infinite loop when rebinding __str__ as
|
|
|
|
# __repr__.
|
|
|
|
class Foo:
|
|
|
|
pass
|
|
|
|
Foo.__repr__ = Foo.__str__
|
|
|
|
foo = Foo()
|
2015-07-03 02:04:23 -03:00
|
|
|
self.assertRaises(RecursionError, str, foo)
|
|
|
|
self.assertRaises(RecursionError, repr, foo)
|
2012-04-24 12:06:25 -03:00
|
|
|
|
|
|
|
def test_mixing_slot_wrappers(self):
|
|
|
|
class X(dict):
|
|
|
|
__setattr__ = dict.__setitem__
|
2019-06-17 08:53:21 -03:00
|
|
|
__neg__ = dict.copy
|
2012-04-24 12:06:25 -03:00
|
|
|
x = X()
|
|
|
|
x.y = 42
|
|
|
|
self.assertEqual(x["y"], 42)
|
2019-06-17 08:53:21 -03:00
|
|
|
self.assertEqual(x, -x)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2019-09-10 08:21:57 -03:00
|
|
|
def test_wrong_class_slot_wrapper(self):
|
|
|
|
# Check bpo-37619: a wrapper descriptor taken from the wrong class
|
|
|
|
# should raise an exception instead of silently being ignored
|
|
|
|
class A(int):
|
|
|
|
__eq__ = str.__eq__
|
|
|
|
__add__ = str.__add__
|
|
|
|
a = A()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
a == a
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
a + a
|
|
|
|
|
2011-08-17 13:48:23 -03:00
|
|
|
def test_slot_shadows_class_variable(self):
|
2011-08-16 20:53:26 -03:00
|
|
|
with self.assertRaises(ValueError) as cm:
|
|
|
|
class X:
|
|
|
|
__slots__ = ["foo"]
|
|
|
|
foo = None
|
|
|
|
m = str(cm.exception)
|
|
|
|
self.assertEqual("'foo' in __slots__ conflicts with class variable", m)
|
|
|
|
|
2011-08-17 14:03:47 -03:00
|
|
|
def test_set_doc(self):
|
|
|
|
class X:
|
|
|
|
"elephant"
|
|
|
|
X.__doc__ = "banana"
|
|
|
|
self.assertEqual(X.__doc__, "banana")
|
2021-04-30 10:25:43 -03:00
|
|
|
|
2011-08-17 14:03:47 -03:00
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
type(list).__dict__["__doc__"].__set__(list, "blah")
|
2021-04-30 10:25:43 -03:00
|
|
|
self.assertIn("cannot set '__doc__' attribute of immutable type 'list'", str(cm.exception))
|
|
|
|
|
2011-08-17 14:03:47 -03:00
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
type(X).__dict__["__doc__"].__delete__(X)
|
2021-04-30 10:25:43 -03:00
|
|
|
self.assertIn("cannot delete '__doc__' attribute of immutable type 'X'", str(cm.exception))
|
2011-08-17 14:03:47 -03:00
|
|
|
self.assertEqual(X.__doc__, "banana")
|
|
|
|
|
2011-12-12 08:47:25 -04:00
|
|
|
def test_qualname(self):
|
|
|
|
descriptors = [str.lower, complex.real, float.real, int.__add__]
|
|
|
|
types = ['method', 'member', 'getset', 'wrapper']
|
|
|
|
|
|
|
|
# make sure we have an example of each type of descriptor
|
|
|
|
for d, n in zip(descriptors, types):
|
|
|
|
self.assertEqual(type(d).__name__, n + '_descriptor')
|
|
|
|
|
|
|
|
for d in descriptors:
|
|
|
|
qualname = d.__objclass__.__qualname__ + '.' + d.__name__
|
|
|
|
self.assertEqual(d.__qualname__, qualname)
|
|
|
|
|
|
|
|
self.assertEqual(str.lower.__qualname__, 'str.lower')
|
|
|
|
self.assertEqual(complex.real.__qualname__, 'complex.real')
|
|
|
|
self.assertEqual(float.real.__qualname__, 'float.real')
|
|
|
|
self.assertEqual(int.__add__.__qualname__, 'int.__add__')
|
|
|
|
|
2012-10-31 01:01:15 -03:00
|
|
|
class X:
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
del X.__qualname__
|
|
|
|
|
|
|
|
self.assertRaises(TypeError, type.__dict__['__qualname__'].__set__,
|
|
|
|
str, 'Oink')
|
|
|
|
|
2013-10-19 17:01:13 -03:00
|
|
|
global Y
|
|
|
|
class Y:
|
2013-10-20 18:50:28 -03:00
|
|
|
class Inside:
|
|
|
|
pass
|
2013-10-19 17:01:13 -03:00
|
|
|
self.assertEqual(Y.__qualname__, 'Y')
|
2013-10-20 18:50:28 -03:00
|
|
|
self.assertEqual(Y.Inside.__qualname__, 'Y.Inside')
|
2013-10-19 17:01:13 -03:00
|
|
|
|
2012-02-24 20:22:36 -04:00
|
|
|
def test_qualname_dict(self):
|
|
|
|
ns = {'__qualname__': 'some.name'}
|
|
|
|
tp = type('Foo', (), ns)
|
|
|
|
self.assertEqual(tp.__qualname__, 'some.name')
|
2012-10-31 00:51:03 -03:00
|
|
|
self.assertNotIn('__qualname__', tp.__dict__)
|
2012-02-24 20:22:36 -04:00
|
|
|
self.assertEqual(ns, {'__qualname__': 'some.name'})
|
|
|
|
|
|
|
|
ns = {'__qualname__': 1}
|
|
|
|
self.assertRaises(TypeError, type, 'Foo', (), ns)
|
|
|
|
|
2012-03-07 20:41:11 -04:00
|
|
|
def test_cycle_through_dict(self):
|
|
|
|
# See bug #1469629
|
|
|
|
class X(dict):
|
|
|
|
def __init__(self):
|
|
|
|
dict.__init__(self)
|
|
|
|
self.__dict__ = self
|
|
|
|
x = X()
|
|
|
|
x.attr = 42
|
|
|
|
wr = weakref.ref(x)
|
|
|
|
del x
|
|
|
|
support.gc_collect()
|
|
|
|
self.assertIsNone(wr())
|
|
|
|
for o in gc.get_objects():
|
|
|
|
self.assertIsNot(type(o), X)
|
|
|
|
|
2012-03-17 02:05:44 -03:00
|
|
|
def test_object_new_and_init_with_parameters(self):
|
|
|
|
# See issue #1683368
|
|
|
|
class OverrideNeither:
|
|
|
|
pass
|
|
|
|
self.assertRaises(TypeError, OverrideNeither, 1)
|
|
|
|
self.assertRaises(TypeError, OverrideNeither, kw=1)
|
|
|
|
class OverrideNew:
|
|
|
|
def __new__(cls, foo, kw=0, *args, **kwds):
|
|
|
|
return object.__new__(cls, *args, **kwds)
|
|
|
|
class OverrideInit:
|
|
|
|
def __init__(self, foo, kw=0, *args, **kwargs):
|
|
|
|
return object.__init__(self, *args, **kwargs)
|
|
|
|
class OverrideBoth(OverrideNew, OverrideInit):
|
|
|
|
pass
|
|
|
|
for case in OverrideNew, OverrideInit, OverrideBoth:
|
|
|
|
case(1)
|
|
|
|
case(1, kw=2)
|
|
|
|
self.assertRaises(TypeError, case, 1, 2, 3)
|
|
|
|
self.assertRaises(TypeError, case, 1, 2, foo=3)
|
|
|
|
|
2014-03-17 17:57:17 -03:00
|
|
|
def test_subclassing_does_not_duplicate_dict_descriptors(self):
|
|
|
|
class Base:
|
|
|
|
pass
|
|
|
|
class Sub(Base):
|
|
|
|
pass
|
|
|
|
self.assertIn("__dict__", Base.__dict__)
|
|
|
|
self.assertNotIn("__dict__", Sub.__dict__)
|
|
|
|
|
2014-08-20 20:41:57 -03:00
|
|
|
def test_bound_method_repr(self):
|
|
|
|
class Foo:
|
|
|
|
def method(self):
|
|
|
|
pass
|
|
|
|
self.assertRegex(repr(Foo().method),
|
|
|
|
r"<bound method .*Foo\.method of <.*Foo object at .*>>")
|
|
|
|
|
|
|
|
|
|
|
|
class Base:
|
|
|
|
def method(self):
|
|
|
|
pass
|
|
|
|
class Derived1(Base):
|
|
|
|
pass
|
|
|
|
class Derived2(Base):
|
|
|
|
def method(self):
|
|
|
|
pass
|
|
|
|
base = Base()
|
|
|
|
derived1 = Derived1()
|
|
|
|
derived2 = Derived2()
|
|
|
|
super_d2 = super(Derived2, derived2)
|
|
|
|
self.assertRegex(repr(base.method),
|
|
|
|
r"<bound method .*Base\.method of <.*Base object at .*>>")
|
|
|
|
self.assertRegex(repr(derived1.method),
|
|
|
|
r"<bound method .*Base\.method of <.*Derived1 object at .*>>")
|
|
|
|
self.assertRegex(repr(derived2.method),
|
|
|
|
r"<bound method .*Derived2\.method of <.*Derived2 object at .*>>")
|
|
|
|
self.assertRegex(repr(super_d2.method),
|
|
|
|
r"<bound method .*Base\.method of <.*Derived2 object at .*>>")
|
|
|
|
|
|
|
|
class Foo:
|
|
|
|
@classmethod
|
|
|
|
def method(cls):
|
|
|
|
pass
|
|
|
|
foo = Foo()
|
|
|
|
self.assertRegex(repr(foo.method), # access via instance
|
2016-07-14 01:13:29 -03:00
|
|
|
r"<bound method .*Foo\.method of <class '.*Foo'>>")
|
2014-08-20 20:41:57 -03:00
|
|
|
self.assertRegex(repr(Foo.method), # access via the class
|
2016-07-14 01:13:29 -03:00
|
|
|
r"<bound method .*Foo\.method of <class '.*Foo'>>")
|
2014-08-20 20:41:57 -03:00
|
|
|
|
|
|
|
|
|
|
|
class MyCallable:
|
|
|
|
def __call__(self, arg):
|
|
|
|
pass
|
|
|
|
func = MyCallable() # func has no __name__ or __qualname__ attributes
|
|
|
|
instance = object()
|
|
|
|
method = types.MethodType(func, instance)
|
|
|
|
self.assertRegex(repr(method),
|
|
|
|
r"<bound method \? of <object object at .*>>")
|
|
|
|
func.__name__ = "name"
|
|
|
|
self.assertRegex(repr(method),
|
|
|
|
r"<bound method name of <object object at .*>>")
|
|
|
|
func.__qualname__ = "qualname"
|
|
|
|
self.assertRegex(repr(method),
|
|
|
|
r"<bound method qualname of <object object at .*>>")
|
|
|
|
|
2018-10-19 18:50:06 -03:00
|
|
|
@unittest.skipIf(_testcapi is None, 'need the _testcapi module')
|
|
|
|
def test_bpo25750(self):
|
|
|
|
# bpo-25750: calling a descriptor (implemented as built-in
|
|
|
|
# function with METH_FASTCALL) should not crash CPython if the
|
|
|
|
# descriptor deletes itself from the class.
|
|
|
|
class Descr:
|
|
|
|
__get__ = _testcapi.bad_get
|
|
|
|
|
|
|
|
class X:
|
|
|
|
descr = Descr()
|
|
|
|
def __new__(cls):
|
|
|
|
cls.descr = None
|
|
|
|
# Create this large list to corrupt some unused memory
|
|
|
|
cls.lst = [2**i for i in range(10000)]
|
|
|
|
X.descr
|
|
|
|
|
2022-01-22 11:53:30 -04:00
|
|
|
def test_remove_subclass(self):
|
|
|
|
# bpo-46417: when the last subclass of a type is deleted,
|
|
|
|
# remove_subclass() clears the internal dictionary of subclasses:
|
|
|
|
# set PyTypeObject.tp_subclasses to NULL. remove_subclass() is called
|
|
|
|
# when a type is deallocated.
|
|
|
|
class Parent:
|
|
|
|
pass
|
|
|
|
self.assertEqual(Parent.__subclasses__(), [])
|
|
|
|
|
|
|
|
class Child(Parent):
|
|
|
|
pass
|
|
|
|
self.assertEqual(Parent.__subclasses__(), [Child])
|
|
|
|
|
|
|
|
del Child
|
|
|
|
gc.collect()
|
|
|
|
self.assertEqual(Parent.__subclasses__(), [])
|
|
|
|
|
2023-12-21 18:08:35 -04:00
|
|
|
def test_instance_method_get_behavior(self):
|
|
|
|
# test case for gh-113157
|
|
|
|
|
|
|
|
class A:
|
|
|
|
def meth(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
class B:
|
|
|
|
pass
|
|
|
|
|
|
|
|
a = A()
|
|
|
|
b = B()
|
|
|
|
b.meth = a.meth.__get__(b, B)
|
|
|
|
self.assertEqual(b.meth(), a)
|
|
|
|
|
2023-04-07 16:11:11 -03:00
|
|
|
def test_attr_raise_through_property(self):
|
2023-05-01 07:10:35 -03:00
|
|
|
# test case for gh-103272
|
2023-04-07 16:11:11 -03:00
|
|
|
class A:
|
|
|
|
def __getattr__(self, name):
|
|
|
|
raise ValueError("FOO")
|
|
|
|
|
|
|
|
@property
|
|
|
|
def foo(self):
|
|
|
|
return self.__getattr__("asdf")
|
|
|
|
|
|
|
|
with self.assertRaisesRegex(ValueError, "FOO"):
|
|
|
|
A().foo
|
|
|
|
|
2023-05-01 07:10:35 -03:00
|
|
|
# test case for gh-103551
|
|
|
|
class B:
|
|
|
|
@property
|
|
|
|
def __getattr__(self, name):
|
|
|
|
raise ValueError("FOO")
|
|
|
|
|
|
|
|
@property
|
|
|
|
def foo(self):
|
|
|
|
raise NotImplementedError("BAR")
|
|
|
|
|
|
|
|
with self.assertRaisesRegex(NotImplementedError, "BAR"):
|
|
|
|
B().foo
|
|
|
|
|
2011-12-12 08:47:25 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
class DictProxyTests(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
class C(object):
|
|
|
|
def meth(self):
|
|
|
|
pass
|
|
|
|
self.C = C
|
|
|
|
|
2011-02-21 23:04:06 -04:00
|
|
|
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
|
|
|
|
'trace function introduces __local__')
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_iter_keys(self):
|
2010-12-06 23:46:27 -04:00
|
|
|
# Testing dict-proxy keys...
|
|
|
|
it = self.C.__dict__.keys()
|
|
|
|
self.assertNotIsInstance(it, list)
|
|
|
|
keys = list(it)
|
2008-02-05 14:13:15 -04:00
|
|
|
keys.sort()
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(keys, ['__dict__', '__doc__', '__module__',
|
2012-10-31 00:51:03 -03:00
|
|
|
'__weakref__', 'meth'])
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2011-02-21 23:04:06 -04:00
|
|
|
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
|
|
|
|
'trace function introduces __local__')
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_iter_values(self):
|
2010-12-06 23:46:27 -04:00
|
|
|
# Testing dict-proxy values...
|
|
|
|
it = self.C.__dict__.values()
|
|
|
|
self.assertNotIsInstance(it, list)
|
|
|
|
values = list(it)
|
2012-10-31 00:51:03 -03:00
|
|
|
self.assertEqual(len(values), 5)
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2011-02-21 23:04:06 -04:00
|
|
|
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
|
|
|
|
'trace function introduces __local__')
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_iter_items(self):
|
|
|
|
# Testing dict-proxy iteritems...
|
2010-12-06 23:46:27 -04:00
|
|
|
it = self.C.__dict__.items()
|
|
|
|
self.assertNotIsInstance(it, list)
|
|
|
|
keys = [item[0] for item in it]
|
2008-02-05 14:13:15 -04:00
|
|
|
keys.sort()
|
|
|
|
self.assertEqual(keys, ['__dict__', '__doc__', '__module__',
|
2012-10-31 00:51:03 -03:00
|
|
|
'__weakref__', 'meth'])
|
2008-02-05 14:13:15 -04:00
|
|
|
|
|
|
|
def test_dict_type_with_metaclass(self):
|
|
|
|
# Testing type of __dict__ when metaclass set...
|
|
|
|
class B(object):
|
|
|
|
pass
|
|
|
|
class M(type):
|
|
|
|
pass
|
|
|
|
class C(metaclass=M):
|
|
|
|
# In 2.3a1, C.__dict__ was a real dict rather than a dict proxy
|
|
|
|
pass
|
|
|
|
self.assertEqual(type(C.__dict__), type(B.__dict__))
|
|
|
|
|
2010-12-18 10:59:43 -04:00
|
|
|
def test_repr(self):
|
2012-04-15 19:16:30 -03:00
|
|
|
# Testing mappingproxy.__repr__.
|
2011-11-25 13:56:07 -04:00
|
|
|
# We can't blindly compare with the repr of another dict as ordering
|
|
|
|
# of keys and values is arbitrary and may differ.
|
|
|
|
r = repr(self.C.__dict__)
|
2012-04-15 19:16:30 -03:00
|
|
|
self.assertTrue(r.startswith('mappingproxy('), r)
|
2011-11-25 13:56:07 -04:00
|
|
|
self.assertTrue(r.endswith(')'), r)
|
|
|
|
for k, v in self.C.__dict__.items():
|
|
|
|
self.assertIn('{!r}: {!r}'.format(k, v), r)
|
2010-12-18 10:59:43 -04:00
|
|
|
|
2008-02-05 14:13:15 -04:00
|
|
|
|
2021-09-19 09:27:33 -03:00
|
|
|
class AAAPTypesLongInitTest(unittest.TestCase):
|
2008-02-05 14:13:15 -04:00
|
|
|
# This is in its own TestCase so that it can be run before any other tests.
|
2021-09-19 09:27:33 -03:00
|
|
|
# (Hence the 'AAA' in the test class name: to make it the first
|
|
|
|
# item in a list sorted by name, like
|
|
|
|
# unittest.TestLoader.getTestCaseNames() does.)
|
2008-02-05 14:13:15 -04:00
|
|
|
def test_pytype_long_ready(self):
|
|
|
|
# Testing SF bug 551412 ...
|
|
|
|
|
|
|
|
# This dumps core when SF bug 551412 isn't fixed --
|
|
|
|
# but only when test_descr.py is run separately.
|
|
|
|
# (That can't be helped -- as soon as PyType_Ready()
|
|
|
|
# is called for PyLong_Type, the bug is gone.)
|
|
|
|
class UserLong(object):
|
|
|
|
def __pow__(self, *args):
|
|
|
|
pass
|
|
|
|
try:
|
|
|
|
pow(0, UserLong(), 0)
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
|
|
|
|
# Another segfault only when run early
|
|
|
|
# (before PyType_Ready(tuple) is called)
|
|
|
|
type.mro(tuple)
|
Merged revisions 60245-60277 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60246 | guido.van.rossum | 2008-01-24 18:58:05 +0100 (Thu, 24 Jan 2008) | 2 lines
Fix test67.py from issue #1303614.
........
r60248 | raymond.hettinger | 2008-01-24 19:05:54 +0100 (Thu, 24 Jan 2008) | 1 line
Clean-up and speed-up code by accessing numerator/denominator directly. There's no reason to enforce readonliness
........
r60249 | raymond.hettinger | 2008-01-24 19:12:23 +0100 (Thu, 24 Jan 2008) | 1 line
Revert 60189 and restore performance.
........
r60250 | guido.van.rossum | 2008-01-24 19:21:02 +0100 (Thu, 24 Jan 2008) | 5 lines
News about recently fixed crashers:
- A few crashers fixed: weakref_in_del.py (issue #1377858);
loosing_dict_ref.py (issue #1303614, test67.py);
borrowed_ref_[34].py (not in tracker).
........
r60252 | thomas.heller | 2008-01-24 19:36:27 +0100 (Thu, 24 Jan 2008) | 7 lines
Use a PyDictObject again for the array type cache; retrieving items
from the WeakValueDictionary was slower by nearly a factor of 3.
To avoid leaks, weakref proxies for the array types are put into the
cache dict, with weakref callbacks that removes the entries when the
type goes away.
........
r60253 | thomas.heller | 2008-01-24 19:54:12 +0100 (Thu, 24 Jan 2008) | 2 lines
Replace Py_BuildValue with PyTuple_Pack because it is faster.
Also add a missing DECREF.
........
r60254 | raymond.hettinger | 2008-01-24 20:05:29 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for trunc().
........
r60255 | thomas.heller | 2008-01-24 20:15:02 +0100 (Thu, 24 Jan 2008) | 5 lines
Invert the checks in get_[u]long and get_[u]longlong. The intent was
to not accept float types; the result was that integer-like objects
were not accepted.
Ported from release25-maint.
........
r60256 | raymond.hettinger | 2008-01-24 20:30:19 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for int(r) just like the other numeric classes.
........
r60263 | raymond.hettinger | 2008-01-24 22:23:58 +0100 (Thu, 24 Jan 2008) | 1 line
Expand tests to include nested graph structures.
........
r60264 | raymond.hettinger | 2008-01-24 22:47:56 +0100 (Thu, 24 Jan 2008) | 1 line
Shorter pprint's for empty sets and frozensets. Fix indentation of frozensets. Add tests including two complex data structures.
........
r60265 | amaury.forgeotdarc | 2008-01-24 23:51:18 +0100 (Thu, 24 Jan 2008) | 14 lines
#1920: when considering a block starting by "while 0", the compiler optimized the
whole construct away, even when an 'else' clause is present::
while 0:
print("no")
else:
print("yes")
did not generate any code at all.
Now the compiler emits the 'else' block, like it already does for 'if' statements.
Will backport.
........
r60266 | amaury.forgeotdarc | 2008-01-24 23:59:25 +0100 (Thu, 24 Jan 2008) | 2 lines
News entry for r60265 (Issue 1920).
........
r60269 | raymond.hettinger | 2008-01-25 00:50:26 +0100 (Fri, 25 Jan 2008) | 1 line
More code cleanup. Remove unnecessary indirection to useless class methods.
........
r60270 | raymond.hettinger | 2008-01-25 01:21:54 +0100 (Fri, 25 Jan 2008) | 1 line
Add support for copy, deepcopy, and pickle.
........
r60271 | raymond.hettinger | 2008-01-25 01:33:45 +0100 (Fri, 25 Jan 2008) | 1 line
Mark todos and review comments.
........
r60272 | raymond.hettinger | 2008-01-25 02:13:12 +0100 (Fri, 25 Jan 2008) | 1 line
Add one other review comment.
........
r60273 | raymond.hettinger | 2008-01-25 02:23:38 +0100 (Fri, 25 Jan 2008) | 1 line
Fix-up signature for approximation.
........
r60274 | raymond.hettinger | 2008-01-25 02:46:33 +0100 (Fri, 25 Jan 2008) | 1 line
More design notes
........
r60276 | neal.norwitz | 2008-01-25 07:37:23 +0100 (Fri, 25 Jan 2008) | 6 lines
Make the test more robust by trying to reconnect up to 3 times
in case there were transient failures. This will hopefully silence
the buildbots for this test. As we find other tests that have a problem,
we can fix with a similar strategy assuming it is successful. It worked
on my box in a loop for 10+ runs where it would have an exception otherwise.
........
r60277 | neal.norwitz | 2008-01-25 09:04:16 +0100 (Fri, 25 Jan 2008) | 4 lines
Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64)
and eliminate a compiler warning in floatobject.c. There might be
a better way to go about this, but it should be good enough for now.
........
2008-01-25 07:23:10 -04:00
|
|
|
|
|
|
|
|
2012-03-08 19:39:08 -04:00
|
|
|
class MiscTests(unittest.TestCase):
|
|
|
|
def test_type_lookup_mro_reference(self):
|
|
|
|
# Issue #14199: _PyType_Lookup() has to keep a strong reference to
|
|
|
|
# the type MRO because it may be modified during the lookup, if
|
|
|
|
# __bases__ is set during the lookup for example.
|
|
|
|
class MyKey(object):
|
|
|
|
def __hash__(self):
|
|
|
|
return hash('mykey')
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
X.__bases__ = (Base2,)
|
|
|
|
|
|
|
|
class Base(object):
|
|
|
|
mykey = 'from Base'
|
|
|
|
mykey2 = 'from Base'
|
|
|
|
|
|
|
|
class Base2(object):
|
|
|
|
mykey = 'from Base2'
|
|
|
|
mykey2 = 'from Base2'
|
|
|
|
|
2024-01-28 19:05:29 -04:00
|
|
|
with self.assertWarnsRegex(RuntimeWarning, 'X'):
|
|
|
|
X = type('X', (Base,), {MyKey(): 5})
|
2012-03-08 19:39:08 -04:00
|
|
|
# mykey is read from Base
|
|
|
|
self.assertEqual(X.mykey, 'from Base')
|
|
|
|
# mykey2 is read from Base2 because MyKey.__eq__ has set __bases__
|
|
|
|
self.assertEqual(X.mykey2, 'from Base2')
|
|
|
|
|
|
|
|
|
2013-11-23 13:59:12 -04:00
|
|
|
class PicklingTests(unittest.TestCase):
|
|
|
|
|
2013-11-23 14:01:36 -04:00
|
|
|
def _check_reduce(self, proto, obj, args=(), kwargs={}, state=None,
|
2013-11-23 13:59:12 -04:00
|
|
|
listitems=None, dictitems=None):
|
2014-12-16 13:43:46 -04:00
|
|
|
if proto >= 2:
|
2013-11-23 13:59:12 -04:00
|
|
|
reduce_value = obj.__reduce_ex__(proto)
|
2014-12-16 13:43:46 -04:00
|
|
|
if kwargs:
|
|
|
|
self.assertEqual(reduce_value[0], copyreg.__newobj_ex__)
|
|
|
|
self.assertEqual(reduce_value[1], (type(obj), args, kwargs))
|
2013-11-23 13:59:12 -04:00
|
|
|
else:
|
2014-12-16 13:43:46 -04:00
|
|
|
self.assertEqual(reduce_value[0], copyreg.__newobj__)
|
|
|
|
self.assertEqual(reduce_value[1], (type(obj),) + args)
|
|
|
|
self.assertEqual(reduce_value[2], state)
|
2013-11-23 13:59:12 -04:00
|
|
|
if listitems is not None:
|
|
|
|
self.assertListEqual(list(reduce_value[3]), listitems)
|
|
|
|
else:
|
|
|
|
self.assertIsNone(reduce_value[3])
|
|
|
|
if dictitems is not None:
|
|
|
|
self.assertDictEqual(dict(reduce_value[4]), dictitems)
|
|
|
|
else:
|
|
|
|
self.assertIsNone(reduce_value[4])
|
|
|
|
else:
|
|
|
|
base_type = type(obj).__base__
|
|
|
|
reduce_value = (copyreg._reconstructor,
|
|
|
|
(type(obj),
|
2013-11-23 14:01:36 -04:00
|
|
|
base_type,
|
2013-11-23 13:59:12 -04:00
|
|
|
None if base_type is object else base_type(obj)))
|
|
|
|
if state is not None:
|
|
|
|
reduce_value += (state,)
|
|
|
|
self.assertEqual(obj.__reduce_ex__(proto), reduce_value)
|
|
|
|
self.assertEqual(obj.__reduce__(), reduce_value)
|
|
|
|
|
|
|
|
def test_reduce(self):
|
|
|
|
protocols = range(pickle.HIGHEST_PROTOCOL + 1)
|
|
|
|
args = (-101, "spam")
|
|
|
|
kwargs = {'bacon': -201, 'fish': -301}
|
|
|
|
state = {'cheese': -401}
|
|
|
|
|
|
|
|
class C1:
|
|
|
|
def __getnewargs__(self):
|
|
|
|
return args
|
|
|
|
obj = C1()
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, args)
|
|
|
|
|
|
|
|
for name, value in state.items():
|
|
|
|
setattr(obj, name, value)
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, args, state=state)
|
|
|
|
|
|
|
|
class C2:
|
|
|
|
def __getnewargs__(self):
|
|
|
|
return "bad args"
|
|
|
|
obj = C2()
|
|
|
|
for proto in protocols:
|
|
|
|
if proto >= 2:
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
obj.__reduce_ex__(proto)
|
|
|
|
|
|
|
|
class C3:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
return (args, kwargs)
|
|
|
|
obj = C3()
|
|
|
|
for proto in protocols:
|
2015-10-11 11:52:09 -03:00
|
|
|
if proto >= 2:
|
2013-11-23 13:59:12 -04:00
|
|
|
self._check_reduce(proto, obj, args, kwargs)
|
|
|
|
|
|
|
|
class C4:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
return (args, "bad dict")
|
|
|
|
class C5:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
return ("bad tuple", kwargs)
|
|
|
|
class C6:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
return ()
|
|
|
|
class C7:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
return "bad args"
|
|
|
|
for proto in protocols:
|
|
|
|
for cls in C4, C5, C6, C7:
|
|
|
|
obj = cls()
|
|
|
|
if proto >= 2:
|
|
|
|
with self.assertRaises((TypeError, ValueError)):
|
|
|
|
obj.__reduce_ex__(proto)
|
|
|
|
|
|
|
|
class C9:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
return (args, {})
|
|
|
|
obj = C9()
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, args)
|
|
|
|
|
|
|
|
class C10:
|
|
|
|
def __getnewargs_ex__(self):
|
|
|
|
raise IndexError
|
|
|
|
obj = C10()
|
|
|
|
for proto in protocols:
|
|
|
|
if proto >= 2:
|
|
|
|
with self.assertRaises(IndexError):
|
|
|
|
obj.__reduce_ex__(proto)
|
|
|
|
|
|
|
|
class C11:
|
|
|
|
def __getstate__(self):
|
|
|
|
return state
|
|
|
|
obj = C11()
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, state=state)
|
|
|
|
|
|
|
|
class C12:
|
|
|
|
def __getstate__(self):
|
|
|
|
return "not dict"
|
|
|
|
obj = C12()
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, state="not dict")
|
|
|
|
|
|
|
|
class C13:
|
|
|
|
def __getstate__(self):
|
|
|
|
raise IndexError
|
|
|
|
obj = C13()
|
|
|
|
for proto in protocols:
|
|
|
|
with self.assertRaises(IndexError):
|
|
|
|
obj.__reduce_ex__(proto)
|
|
|
|
if proto < 2:
|
|
|
|
with self.assertRaises(IndexError):
|
|
|
|
obj.__reduce__()
|
|
|
|
|
|
|
|
class C14:
|
|
|
|
__slots__ = tuple(state)
|
|
|
|
def __init__(self):
|
|
|
|
for name, value in state.items():
|
|
|
|
setattr(self, name, value)
|
|
|
|
|
|
|
|
obj = C14()
|
|
|
|
for proto in protocols:
|
|
|
|
if proto >= 2:
|
|
|
|
self._check_reduce(proto, obj, state=(None, state))
|
|
|
|
else:
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
obj.__reduce_ex__(proto)
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
obj.__reduce__()
|
|
|
|
|
|
|
|
class C15(dict):
|
|
|
|
pass
|
|
|
|
obj = C15({"quebec": -601})
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, dictitems=dict(obj))
|
|
|
|
|
|
|
|
class C16(list):
|
|
|
|
pass
|
|
|
|
obj = C16(["yukon"])
|
|
|
|
for proto in protocols:
|
|
|
|
self._check_reduce(proto, obj, listitems=list(obj))
|
|
|
|
|
2014-02-16 14:49:16 -04:00
|
|
|
def test_special_method_lookup(self):
|
|
|
|
protocols = range(pickle.HIGHEST_PROTOCOL + 1)
|
|
|
|
class Picky:
|
|
|
|
def __getstate__(self):
|
|
|
|
return {}
|
|
|
|
|
|
|
|
def __getattr__(self, attr):
|
|
|
|
if attr in ("__getnewargs__", "__getnewargs_ex__"):
|
|
|
|
raise AssertionError(attr)
|
|
|
|
return None
|
|
|
|
for protocol in protocols:
|
|
|
|
state = {} if protocol >= 2 else None
|
|
|
|
self._check_reduce(protocol, Picky(), state=state)
|
|
|
|
|
2013-11-23 13:59:12 -04:00
|
|
|
def _assert_is_copy(self, obj, objcopy, msg=None):
|
|
|
|
"""Utility method to verify if two objects are copies of each others.
|
|
|
|
"""
|
|
|
|
if msg is None:
|
|
|
|
msg = "{!r} is not a copy of {!r}".format(obj, objcopy)
|
|
|
|
if type(obj).__repr__ is object.__repr__:
|
|
|
|
# We have this limitation for now because we use the object's repr
|
|
|
|
# to help us verify that the two objects are copies. This allows
|
|
|
|
# us to delegate the non-generic verification logic to the objects
|
|
|
|
# themselves.
|
|
|
|
raise ValueError("object passed to _assert_is_copy must " +
|
|
|
|
"override the __repr__ method.")
|
|
|
|
self.assertIsNot(obj, objcopy, msg=msg)
|
|
|
|
self.assertIs(type(obj), type(objcopy), msg=msg)
|
|
|
|
if hasattr(obj, '__dict__'):
|
|
|
|
self.assertDictEqual(obj.__dict__, objcopy.__dict__, msg=msg)
|
|
|
|
self.assertIsNot(obj.__dict__, objcopy.__dict__, msg=msg)
|
|
|
|
if hasattr(obj, '__slots__'):
|
|
|
|
self.assertListEqual(obj.__slots__, objcopy.__slots__, msg=msg)
|
|
|
|
for slot in obj.__slots__:
|
|
|
|
self.assertEqual(
|
|
|
|
hasattr(obj, slot), hasattr(objcopy, slot), msg=msg)
|
|
|
|
self.assertEqual(getattr(obj, slot, None),
|
|
|
|
getattr(objcopy, slot, None), msg=msg)
|
|
|
|
self.assertEqual(repr(obj), repr(objcopy), msg=msg)
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
def _generate_pickle_copiers():
|
|
|
|
"""Utility method to generate the many possible pickle configurations.
|
|
|
|
"""
|
|
|
|
class PickleCopier:
|
|
|
|
"This class copies object using pickle."
|
|
|
|
def __init__(self, proto, dumps, loads):
|
|
|
|
self.proto = proto
|
|
|
|
self.dumps = dumps
|
|
|
|
self.loads = loads
|
|
|
|
def copy(self, obj):
|
|
|
|
return self.loads(self.dumps(obj, self.proto))
|
|
|
|
def __repr__(self):
|
|
|
|
# We try to be as descriptive as possible here since this is
|
|
|
|
# the string which we will allow us to tell the pickle
|
|
|
|
# configuration we are using during debugging.
|
|
|
|
return ("PickleCopier(proto={}, dumps={}.{}, loads={}.{})"
|
|
|
|
.format(self.proto,
|
|
|
|
self.dumps.__module__, self.dumps.__qualname__,
|
|
|
|
self.loads.__module__, self.loads.__qualname__))
|
|
|
|
return (PickleCopier(*args) for args in
|
|
|
|
itertools.product(range(pickle.HIGHEST_PROTOCOL + 1),
|
|
|
|
{pickle.dumps, pickle._dumps},
|
|
|
|
{pickle.loads, pickle._loads}))
|
|
|
|
|
|
|
|
def test_pickle_slots(self):
|
|
|
|
# Tests pickling of classes with __slots__.
|
|
|
|
|
|
|
|
# Pickling of classes with __slots__ but without __getstate__ should
|
|
|
|
# fail (if using protocol 0 or 1)
|
|
|
|
global C
|
|
|
|
class C:
|
|
|
|
__slots__ = ['a']
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
pickle.dumps(C(), 0)
|
|
|
|
|
|
|
|
global D
|
|
|
|
class D(C):
|
|
|
|
pass
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
pickle.dumps(D(), 0)
|
|
|
|
|
|
|
|
class C:
|
|
|
|
"A class with __getstate__ and __setstate__ implemented."
|
|
|
|
__slots__ = ['a']
|
|
|
|
def __getstate__(self):
|
|
|
|
state = getattr(self, '__dict__', {}).copy()
|
|
|
|
for cls in type(self).__mro__:
|
2013-11-23 14:01:36 -04:00
|
|
|
for slot in cls.__dict__.get('__slots__', ()):
|
2013-11-23 13:59:12 -04:00
|
|
|
try:
|
|
|
|
state[slot] = getattr(self, slot)
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
|
|
|
return state
|
|
|
|
def __setstate__(self, state):
|
|
|
|
for k, v in state.items():
|
|
|
|
setattr(self, k, v)
|
|
|
|
def __repr__(self):
|
|
|
|
return "%s()<%r>" % (type(self).__name__, self.__getstate__())
|
|
|
|
|
|
|
|
class D(C):
|
|
|
|
"A subclass of a class with slots."
|
|
|
|
pass
|
|
|
|
|
|
|
|
global E
|
|
|
|
class E(C):
|
|
|
|
"A subclass with an extra slot."
|
|
|
|
__slots__ = ['b']
|
|
|
|
|
|
|
|
# Now it should work
|
|
|
|
for pickle_copier in self._generate_pickle_copiers():
|
|
|
|
with self.subTest(pickle_copier=pickle_copier):
|
|
|
|
x = C()
|
|
|
|
y = pickle_copier.copy(x)
|
|
|
|
self._assert_is_copy(x, y)
|
|
|
|
|
|
|
|
x.a = 42
|
|
|
|
y = pickle_copier.copy(x)
|
|
|
|
self._assert_is_copy(x, y)
|
|
|
|
|
|
|
|
x = D()
|
|
|
|
x.a = 42
|
|
|
|
x.b = 100
|
|
|
|
y = pickle_copier.copy(x)
|
|
|
|
self._assert_is_copy(x, y)
|
|
|
|
|
|
|
|
x = E()
|
|
|
|
x.a = 42
|
|
|
|
x.b = "foo"
|
|
|
|
y = pickle_copier.copy(x)
|
|
|
|
self._assert_is_copy(x, y)
|
|
|
|
|
|
|
|
def test_reduce_copying(self):
|
|
|
|
# Tests pickling and copying new-style classes and objects.
|
|
|
|
global C1
|
|
|
|
class C1:
|
|
|
|
"The state of this class is copyable via its instance dict."
|
|
|
|
ARGS = (1, 2)
|
|
|
|
NEED_DICT_COPYING = True
|
|
|
|
def __init__(self, a, b):
|
|
|
|
super().__init__()
|
|
|
|
self.a = a
|
|
|
|
self.b = b
|
|
|
|
def __repr__(self):
|
|
|
|
return "C1(%r, %r)" % (self.a, self.b)
|
|
|
|
|
|
|
|
global C2
|
|
|
|
class C2(list):
|
|
|
|
"A list subclass copyable via __getnewargs__."
|
|
|
|
ARGS = (1, 2)
|
|
|
|
NEED_DICT_COPYING = False
|
|
|
|
def __new__(cls, a, b):
|
|
|
|
self = super().__new__(cls)
|
|
|
|
self.a = a
|
|
|
|
self.b = b
|
|
|
|
return self
|
|
|
|
def __init__(self, *args):
|
|
|
|
super().__init__()
|
|
|
|
# This helps testing that __init__ is not called during the
|
|
|
|
# unpickling process, which would cause extra appends.
|
|
|
|
self.append("cheese")
|
|
|
|
@classmethod
|
|
|
|
def __getnewargs__(cls):
|
|
|
|
return cls.ARGS
|
|
|
|
def __repr__(self):
|
|
|
|
return "C2(%r, %r)<%r>" % (self.a, self.b, list(self))
|
|
|
|
|
|
|
|
global C3
|
|
|
|
class C3(list):
|
|
|
|
"A list subclass copyable via __getstate__."
|
|
|
|
ARGS = (1, 2)
|
|
|
|
NEED_DICT_COPYING = False
|
|
|
|
def __init__(self, a, b):
|
|
|
|
self.a = a
|
|
|
|
self.b = b
|
|
|
|
# This helps testing that __init__ is not called during the
|
|
|
|
# unpickling process, which would cause extra appends.
|
|
|
|
self.append("cheese")
|
|
|
|
@classmethod
|
|
|
|
def __getstate__(cls):
|
|
|
|
return cls.ARGS
|
|
|
|
def __setstate__(self, state):
|
|
|
|
a, b = state
|
|
|
|
self.a = a
|
|
|
|
self.b = b
|
|
|
|
def __repr__(self):
|
|
|
|
return "C3(%r, %r)<%r>" % (self.a, self.b, list(self))
|
|
|
|
|
|
|
|
global C4
|
|
|
|
class C4(int):
|
|
|
|
"An int subclass copyable via __getnewargs__."
|
|
|
|
ARGS = ("hello", "world", 1)
|
|
|
|
NEED_DICT_COPYING = False
|
|
|
|
def __new__(cls, a, b, value):
|
|
|
|
self = super().__new__(cls, value)
|
|
|
|
self.a = a
|
|
|
|
self.b = b
|
|
|
|
return self
|
|
|
|
@classmethod
|
|
|
|
def __getnewargs__(cls):
|
|
|
|
return cls.ARGS
|
|
|
|
def __repr__(self):
|
|
|
|
return "C4(%r, %r)<%r>" % (self.a, self.b, int(self))
|
|
|
|
|
|
|
|
global C5
|
|
|
|
class C5(int):
|
|
|
|
"An int subclass copyable via __getnewargs_ex__."
|
|
|
|
ARGS = (1, 2)
|
|
|
|
KWARGS = {'value': 3}
|
|
|
|
NEED_DICT_COPYING = False
|
|
|
|
def __new__(cls, a, b, *, value=0):
|
|
|
|
self = super().__new__(cls, value)
|
|
|
|
self.a = a
|
|
|
|
self.b = b
|
|
|
|
return self
|
|
|
|
@classmethod
|
|
|
|
def __getnewargs_ex__(cls):
|
|
|
|
return (cls.ARGS, cls.KWARGS)
|
|
|
|
def __repr__(self):
|
|
|
|
return "C5(%r, %r)<%r>" % (self.a, self.b, int(self))
|
|
|
|
|
|
|
|
test_classes = (C1, C2, C3, C4, C5)
|
|
|
|
# Testing copying through pickle
|
|
|
|
pickle_copiers = self._generate_pickle_copiers()
|
|
|
|
for cls, pickle_copier in itertools.product(test_classes, pickle_copiers):
|
|
|
|
with self.subTest(cls=cls, pickle_copier=pickle_copier):
|
|
|
|
kwargs = getattr(cls, 'KWARGS', {})
|
|
|
|
obj = cls(*cls.ARGS, **kwargs)
|
|
|
|
proto = pickle_copier.proto
|
|
|
|
objcopy = pickle_copier.copy(obj)
|
|
|
|
self._assert_is_copy(obj, objcopy)
|
|
|
|
# For test classes that supports this, make sure we didn't go
|
|
|
|
# around the reduce protocol by simply copying the attribute
|
|
|
|
# dictionary. We clear attributes using the previous copy to
|
|
|
|
# not mutate the original argument.
|
|
|
|
if proto >= 2 and not cls.NEED_DICT_COPYING:
|
|
|
|
objcopy.__dict__.clear()
|
|
|
|
objcopy2 = pickle_copier.copy(objcopy)
|
|
|
|
self._assert_is_copy(obj, objcopy2)
|
|
|
|
|
|
|
|
# Testing copying through copy.deepcopy()
|
|
|
|
for cls in test_classes:
|
|
|
|
with self.subTest(cls=cls):
|
|
|
|
kwargs = getattr(cls, 'KWARGS', {})
|
|
|
|
obj = cls(*cls.ARGS, **kwargs)
|
|
|
|
objcopy = deepcopy(obj)
|
|
|
|
self._assert_is_copy(obj, objcopy)
|
|
|
|
# For test classes that supports this, make sure we didn't go
|
|
|
|
# around the reduce protocol by simply copying the attribute
|
|
|
|
# dictionary. We clear attributes using the previous copy to
|
|
|
|
# not mutate the original argument.
|
|
|
|
if not cls.NEED_DICT_COPYING:
|
|
|
|
objcopy.__dict__.clear()
|
|
|
|
objcopy2 = deepcopy(objcopy)
|
|
|
|
self._assert_is_copy(obj, objcopy2)
|
|
|
|
|
2015-11-25 12:33:29 -04:00
|
|
|
def test_issue24097(self):
|
|
|
|
# Slot name is freed inside __getattr__ and is later used.
|
|
|
|
class S(str): # Not interned
|
|
|
|
pass
|
|
|
|
class A:
|
|
|
|
__slotnames__ = [S('spam')]
|
|
|
|
def __getattr__(self, attr):
|
|
|
|
if attr == 'spam':
|
|
|
|
A.__slotnames__[:] = [S('spam')]
|
|
|
|
return 42
|
|
|
|
else:
|
|
|
|
raise AttributeError
|
|
|
|
|
|
|
|
import copyreg
|
|
|
|
expected = (copyreg.__newobj__, (A,), (None, {'spam': 42}), None, None)
|
2017-04-08 03:52:59 -03:00
|
|
|
self.assertEqual(A().__reduce_ex__(2), expected) # Shouldn't crash
|
|
|
|
|
|
|
|
def test_object_reduce(self):
|
|
|
|
# Issue #29914
|
|
|
|
# __reduce__() takes no arguments
|
|
|
|
object().__reduce__()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
object().__reduce__(0)
|
|
|
|
# __reduce_ex__() takes one integer argument
|
|
|
|
object().__reduce_ex__(0)
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
object().__reduce_ex__()
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
object().__reduce_ex__(None)
|
2015-11-25 12:33:29 -04:00
|
|
|
|
2013-11-23 13:59:12 -04:00
|
|
|
|
2014-03-17 18:20:12 -03:00
|
|
|
class SharedKeyTests(unittest.TestCase):
|
|
|
|
|
|
|
|
@support.cpython_only
|
|
|
|
def test_subclasses(self):
|
|
|
|
# Verify that subclasses can share keys (per PEP 412)
|
|
|
|
class A:
|
|
|
|
pass
|
|
|
|
class B(A):
|
|
|
|
pass
|
|
|
|
|
2021-10-13 10:19:34 -03:00
|
|
|
#Shrink keys by repeatedly creating instances
|
2022-02-08 07:50:38 -04:00
|
|
|
[(A(), B()) for _ in range(30)]
|
2021-10-13 10:19:34 -03:00
|
|
|
|
2014-03-17 18:20:12 -03:00
|
|
|
a, b = A(), B()
|
|
|
|
self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b)))
|
2019-03-12 05:25:44 -03:00
|
|
|
self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({"a":1}))
|
2021-10-13 10:19:34 -03:00
|
|
|
# Initial hash table can contain only one or two elements.
|
2016-09-07 21:40:12 -03:00
|
|
|
# Set 6 attributes to cause internal resizing.
|
|
|
|
a.x, a.y, a.z, a.w, a.v, a.u = range(6)
|
2014-03-17 18:20:12 -03:00
|
|
|
self.assertNotEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b)))
|
|
|
|
a2 = A()
|
2021-10-13 10:19:34 -03:00
|
|
|
self.assertGreater(sys.getsizeof(vars(a)), sys.getsizeof(vars(a2)))
|
|
|
|
self.assertLess(sys.getsizeof(vars(a2)), sys.getsizeof({"a":1}))
|
2019-03-12 05:25:44 -03:00
|
|
|
self.assertLess(sys.getsizeof(vars(b)), sys.getsizeof({"a":1}))
|
2014-03-17 18:20:12 -03:00
|
|
|
|
|
|
|
|
2015-02-05 23:29:14 -04:00
|
|
|
class DebugHelperMeta(type):
|
|
|
|
"""
|
|
|
|
Sets default __doc__ and simplifies repr() output.
|
|
|
|
"""
|
|
|
|
def __new__(mcls, name, bases, attrs):
|
|
|
|
if attrs.get('__doc__') is None:
|
|
|
|
attrs['__doc__'] = name # helps when debugging with gdb
|
|
|
|
return type.__new__(mcls, name, bases, attrs)
|
|
|
|
def __repr__(cls):
|
|
|
|
return repr(cls.__name__)
|
|
|
|
|
|
|
|
|
|
|
|
class MroTest(unittest.TestCase):
|
|
|
|
"""
|
|
|
|
Regressions for some bugs revealed through
|
|
|
|
mcsl.mro() customization (typeobject.c: mro_internal()) and
|
|
|
|
cls.__bases__ assignment (typeobject.c: type_set_bases()).
|
|
|
|
"""
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.step = 0
|
|
|
|
self.ready = False
|
|
|
|
|
|
|
|
def step_until(self, limit):
|
|
|
|
ret = (self.step < limit)
|
|
|
|
if ret:
|
|
|
|
self.step += 1
|
|
|
|
return ret
|
|
|
|
|
|
|
|
def test_incomplete_set_bases_on_self(self):
|
|
|
|
"""
|
|
|
|
type_set_bases must be aware that type->tp_mro can be NULL.
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if self.step_until(1):
|
|
|
|
assert cls.__mro__ is None
|
|
|
|
cls.__bases__ += ()
|
|
|
|
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def test_reent_set_bases_on_base(self):
|
|
|
|
"""
|
|
|
|
Deep reentrancy must not over-decref old_mro.
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if cls.__mro__ is not None and cls.__name__ == 'B':
|
|
|
|
# 4-5 steps are usually enough to make it crash somewhere
|
|
|
|
if self.step_until(10):
|
|
|
|
A.__bases__ += ()
|
|
|
|
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
class B(A):
|
|
|
|
pass
|
|
|
|
B.__bases__ += ()
|
|
|
|
|
|
|
|
def test_reent_set_bases_on_direct_base(self):
|
|
|
|
"""
|
|
|
|
Similar to test_reent_set_bases_on_base, but may crash differently.
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
base = cls.__bases__[0]
|
|
|
|
if base is not object:
|
|
|
|
if self.step_until(5):
|
|
|
|
base.__bases__ += ()
|
|
|
|
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
class B(A):
|
|
|
|
pass
|
|
|
|
class C(B):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def test_reent_set_bases_tp_base_cycle(self):
|
|
|
|
"""
|
|
|
|
type_set_bases must check for an inheritance cycle not only through
|
|
|
|
MRO of the type, which may be not yet updated in case of reentrance,
|
|
|
|
but also through tp_base chain, which is assigned before diving into
|
|
|
|
inner calls to mro().
|
|
|
|
|
|
|
|
Otherwise, the following snippet can loop forever:
|
|
|
|
do {
|
|
|
|
// ...
|
|
|
|
type = type->tp_base;
|
|
|
|
} while (type != NULL);
|
|
|
|
|
|
|
|
Functions that rely on tp_base (like solid_base and PyType_IsSubtype)
|
|
|
|
would not be happy in that case, causing a stack overflow.
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if self.ready:
|
|
|
|
if cls.__name__ == 'B1':
|
|
|
|
B2.__bases__ = (B1,)
|
|
|
|
if cls.__name__ == 'B2':
|
|
|
|
B1.__bases__ = (B2,)
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
class B1(A):
|
|
|
|
pass
|
|
|
|
class B2(A):
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.ready = True
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
B1.__bases__ += ()
|
|
|
|
|
|
|
|
def test_tp_subclasses_cycle_in_update_slots(self):
|
|
|
|
"""
|
|
|
|
type_set_bases must check for reentrancy upon finishing its job
|
|
|
|
by updating tp_subclasses of old/new bases of the type.
|
|
|
|
Otherwise, an implicit inheritance cycle through tp_subclasses
|
|
|
|
can break functions that recurse on elements of that field
|
|
|
|
(like recurse_down_subclasses and mro_hierarchy) eventually
|
|
|
|
leading to a stack overflow.
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if self.ready and cls.__name__ == 'C':
|
|
|
|
self.ready = False
|
|
|
|
C.__bases__ = (B2,)
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
class B1(A):
|
|
|
|
pass
|
|
|
|
class B2(A):
|
|
|
|
pass
|
|
|
|
class C(A):
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.ready = True
|
|
|
|
C.__bases__ = (B1,)
|
|
|
|
B1.__bases__ = (C,)
|
|
|
|
|
|
|
|
self.assertEqual(C.__bases__, (B2,))
|
|
|
|
self.assertEqual(B2.__subclasses__(), [C])
|
|
|
|
self.assertEqual(B1.__subclasses__(), [])
|
|
|
|
|
|
|
|
self.assertEqual(B1.__bases__, (C,))
|
|
|
|
self.assertEqual(C.__subclasses__(), [B1])
|
|
|
|
|
|
|
|
def test_tp_subclasses_cycle_error_return_path(self):
|
|
|
|
"""
|
|
|
|
The same as test_tp_subclasses_cycle_in_update_slots, but tests
|
|
|
|
a code path executed on error (goto bail).
|
|
|
|
"""
|
|
|
|
class E(Exception):
|
|
|
|
pass
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if self.ready and cls.__name__ == 'C':
|
|
|
|
if C.__bases__ == (B2,):
|
|
|
|
self.ready = False
|
|
|
|
else:
|
|
|
|
C.__bases__ = (B2,)
|
|
|
|
raise E
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
class B1(A):
|
|
|
|
pass
|
|
|
|
class B2(A):
|
|
|
|
pass
|
|
|
|
class C(A):
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.ready = True
|
|
|
|
with self.assertRaises(E):
|
|
|
|
C.__bases__ = (B1,)
|
|
|
|
B1.__bases__ = (C,)
|
|
|
|
|
|
|
|
self.assertEqual(C.__bases__, (B2,))
|
|
|
|
self.assertEqual(C.__mro__, tuple(type.mro(C)))
|
|
|
|
|
|
|
|
def test_incomplete_extend(self):
|
|
|
|
"""
|
2021-06-12 23:47:44 -03:00
|
|
|
Extending an uninitialized type with type->tp_mro == NULL must
|
2015-02-05 23:29:14 -04:00
|
|
|
throw a reasonable TypeError exception, instead of failing
|
|
|
|
with PyErr_BadInternalCall.
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if cls.__mro__ is None and cls.__name__ != 'X':
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class X(cls):
|
|
|
|
pass
|
|
|
|
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def test_incomplete_super(self):
|
|
|
|
"""
|
2021-10-06 20:13:48 -03:00
|
|
|
Attribute lookup on a super object must be aware that
|
2015-02-05 23:29:14 -04:00
|
|
|
its target type can be uninitialized (type->tp_mro == NULL).
|
|
|
|
"""
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
if cls.__mro__ is None:
|
|
|
|
with self.assertRaises(AttributeError):
|
|
|
|
super(cls, cls).xxx
|
|
|
|
|
|
|
|
return type.mro(cls)
|
|
|
|
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
|
2022-05-06 01:01:15 -03:00
|
|
|
def test_disappearing_custom_mro(self):
|
|
|
|
"""
|
|
|
|
gh-92112: A custom mro() returning a result conflicting with
|
|
|
|
__bases__ and deleting itself caused a double free.
|
|
|
|
"""
|
|
|
|
class B:
|
|
|
|
pass
|
|
|
|
|
|
|
|
class M(DebugHelperMeta):
|
|
|
|
def mro(cls):
|
|
|
|
del M.mro
|
|
|
|
return (B,)
|
|
|
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
class A(metaclass=M):
|
|
|
|
pass
|
|
|
|
|
2015-02-05 23:29:14 -04:00
|
|
|
|
2001-09-20 18:39:07 -03:00
|
|
|
if __name__ == "__main__":
|
2021-09-19 09:27:33 -03:00
|
|
|
unittest.main()
|