cls, msg = self.get_except(Person, b"Someone", (1, 2))
self.assertEqual(cls, RuntimeError)
- self.assertEqual(msg,
- "(Phone) <class 'TypeError'>: "
- "expected bytes, int found")
+ self.assertRegex(msg,
+ r"\(Phone\) <class 'TypeError' at 0x.+>: "
+ r"expected bytes, int found")
cls, msg = self.get_except(Person, b"Someone", (b"a", b"b", b"c"))
self.assertEqual(cls, RuntimeError)
- self.assertEqual(msg,
- "(Phone) <class 'TypeError'>: too many initializers")
+ self.assertRegex(msg,
+ r"\(Phone\) <class 'TypeError' at 0x.+>: too many initializers")
def test_huge_field_name(self):
# issue12881: segfault with large structure field names
--------
>>> _sum([3, 2.25, 4.5, -0.5, 1.0], 0.75)
- (<class 'float'>, Fraction(11, 1), 5)
+ (<class 'float' ...>, Fraction(11, 1), 5)
Some sources of round-off error will be avoided:
>>> _sum([1e50, 1, -1e50] * 1000) # Built-in sum returns zero.
- (<class 'float'>, Fraction(1000, 1), 3000)
+ (<class 'float' ...>, Fraction(1000, 1), 3000)
Fractions and Decimals are also supported:
>>> from fractions import Fraction as F
>>> _sum([F(2, 3), F(7, 5), F(1, 4), F(5, 6)])
- (<class 'fractions.Fraction'>, Fraction(63, 20), 4)
+ (<class 'fractions.Fraction' ...>, Fraction(63, 20), 4)
>>> from decimal import Decimal as D
>>> data = [D("0.1375"), D("0.2108"), D("0.3061"), D("0.0419")]
>>> _sum(data)
- (<class 'decimal.Decimal'>, Fraction(6963, 10000), 4)
+ (<class 'decimal.Decimal' ...>, Fraction(6963, 10000), 4)
Mixed types are currently treated as an error, except that int is
allowed.
a = A(hash(A.f)^(-1))
hash(a.f)
+ def test_class_repr(self):
+ # We should get the address of the object
+ class A:
+ pass
+
+ result = repr(A)
+ self.assertRegex(result,
+ "<class 'test.test_class.ClassTests.test_class_repr.<locals>.A'"
+ " at 0x.+>")
+
if __name__ == '__main__':
unittest.main()
print(printed_package)
print(printed_argv0)
print(printed_cwd)
- self.assertIn(printed_loader.encode('utf-8'), data)
+ expected = printed_loader.encode('utf-8')
+ idx = expected.find(b"at 0x")
+ expected = expected[:idx]
+ self.assertIn(expected, data)
self.assertIn(printed_file.encode('utf-8'), data)
self.assertIn(printed_package.encode('utf-8'), data)
self.assertIn(printed_argv0.encode('utf-8'), data)
def test_dash_c_loader(self):
rc, out, err = assert_python_ok("-c", "print(__loader__)")
expected = repr(importlib.machinery.BuiltinImporter).encode("utf-8")
+ idx = expected.find(b"at 0x")
+ expected = expected[:idx]
self.assertIn(expected, out)
def test_stdin_loader(self):
finally:
out = kill_python(p)
expected = repr(importlib.machinery.BuiltinImporter).encode("utf-8")
+ idx = expected.find(b"at 0x")
+ expected = expected[:idx]
self.assertIn(expected, out)
@contextlib.contextmanager
d2 = defaultdict(int)
self.assertEqual(d2.default_factory, int)
d2[12] = 42
- self.assertEqual(repr(d2), "defaultdict(<class 'int'>, {12: 42})")
+ self.assertRegex(repr(d2), r"defaultdict\(<class 'int' at 0x.+>, {12: 42}\)")
def foo(): return 43
d3 = defaultdict(foo)
self.assertTrue(d3.default_factory is foo)
pass
foo = Foo()
self.assertRegex(repr(foo.method), # access via instance
- r"<bound method .*Foo\.method of <class '.*Foo'>>")
+ r"<bound method .*Foo\.method of <class '.*Foo' at 0x.+>>")
self.assertRegex(repr(Foo.method), # access via the class
- r"<bound method .*Foo\.method of <class '.*Foo'>>")
+ r"<bound method .*Foo\.method of <class '.*Foo' at 0x.+>>")
class MyCallable:
Here's the new type at work:
>>> print(defaultdict) # show our type
- <class 'test.test_descrtut.defaultdict'>
+ <class 'test.test_descrtut.defaultdict' ...>
>>> print(type(defaultdict)) # its metatype
- <class 'type'>
+ <class 'type' ...>
>>> a = defaultdict(default=0.0) # create an instance
>>> print(a) # show the instance
{}
>>> print(type(a)) # show its type
- <class 'test.test_descrtut.defaultdict'>
+ <class 'test.test_descrtut.defaultdict' ...>
>>> print(a.__class__) # show its class
- <class 'test.test_descrtut.defaultdict'>
+ <class 'test.test_descrtut.defaultdict' ...>
>>> print(type(a) is a.__class__) # its type is its class
True
>>> a[1] = 3.25 # modify the instance
For instance of built-in types, x.__class__ is now the same as type(x):
>>> type([])
- <class 'list'>
+ <class 'list' ...>
>>> [].__class__
- <class 'list'>
+ <class 'list' ...>
>>> list
- <class 'list'>
+ <class 'list' ...>
>>> isinstance([], list)
True
>>> isinstance([], dict)
... print("classmethod", cls, y)
>>> C.foo(1)
- classmethod <class 'test.test_descrtut.C'> 1
+ classmethod <class 'test.test_descrtut.C' ...> 1
>>> c = C()
>>> c.foo(1)
- classmethod <class 'test.test_descrtut.C'> 1
+ classmethod <class 'test.test_descrtut.C' ...> 1
>>> class D(C):
... pass
>>> D.foo(1)
- classmethod <class 'test.test_descrtut.D'> 1
+ classmethod <class 'test.test_descrtut.D' ...> 1
>>> d = D()
>>> d.foo(1)
- classmethod <class 'test.test_descrtut.D'> 1
+ classmethod <class 'test.test_descrtut.D' ...> 1
This prints "classmethod __main__.D 1" both times; in other words, the
class passed as the first argument of foo() is the class involved in the
>>> E.foo(1)
E.foo() called
- classmethod <class 'test.test_descrtut.C'> 1
+ classmethod <class 'test.test_descrtut.C' ...> 1
>>> e = E()
>>> e.foo(1)
E.foo() called
- classmethod <class 'test.test_descrtut.C'> 1
+ classmethod <class 'test.test_descrtut.C' ...> 1
In this example, the call to C.foo() from E.foo() will see class C as its
first argument, not class E. This is to be expected, since the call
>>> del property # unmask the builtin
>>> property
- <class 'property'>
+ <class 'property' ...>
>>> class C(object):
... def __init__(self):
# business is used the name can change depending on how the test is
# invoked.
from test import support, test_descrtut
- support.run_doctest(test_descrtut, verbose)
+ import doctest
+ support.run_doctest(test_descrtut, verbose, optionflags=doctest.ELLIPSIS)
# This part isn't needed for regrtest, but for running the test directly.
if __name__ == "__main__":
`__file__` global, which is set to the name of the file
containing the tests:
- >>> suite = doctest.DocFileSuite('test_doctest3.txt')
+ >>> suite = doctest.DocFileSuite('test_doctest3.txt', optionflags=doctest.ELLIPSIS)
>>> suite.run(unittest.TestResult())
<unittest.result.TestResult run=1 errors=0 failures=0>
Here we check that `__file__` is provided:
>>> type(__file__)
- <class 'str'>
+ <class 'str' ...>
c.Container.register(P)
with self.assertRaises(RuntimeError) as re_one:
g(p)
- self.assertIn(
- str(re_one.exception),
- (("Ambiguous dispatch: <class 'collections.abc.Container'> "
- "or <class 'collections.abc.Iterable'>"),
- ("Ambiguous dispatch: <class 'collections.abc.Iterable'> "
- "or <class 'collections.abc.Container'>")),
- )
+ self.assertIn("Ambiguous dispatch:", str(re_one.exception))
+ self.assertIn("<class 'collections.abc.Container'", str(re_one.exception))
+ self.assertIn("<class 'collections.abc.Iterable'", str(re_one.exception))
+
class Q(c.Sized):
def __len__(self):
return 0
# perspective.
with self.assertRaises(RuntimeError) as re_two:
h(c.defaultdict(lambda: 0))
- self.assertIn(
- str(re_two.exception),
- (("Ambiguous dispatch: <class 'collections.abc.Container'> "
- "or <class 'collections.abc.Sized'>"),
- ("Ambiguous dispatch: <class 'collections.abc.Sized'> "
- "or <class 'collections.abc.Container'>")),
- )
+ self.assertIn("Ambiguous dispatch:", str(re_two.exception))
+ self.assertIn("<class 'collections.abc.Container'", str(re_two.exception))
+ self.assertIn("<class 'collections.abc.Sized'", str(re_two.exception))
+
class R(c.defaultdict):
pass
c.MutableSequence.register(R)
# There is no preference for registered versus inferred ABCs.
with self.assertRaises(RuntimeError) as re_three:
h(u)
- self.assertIn(
- str(re_three.exception),
- (("Ambiguous dispatch: <class 'collections.abc.Container'> "
- "or <class 'collections.abc.Sized'>"),
- ("Ambiguous dispatch: <class 'collections.abc.Sized'> "
- "or <class 'collections.abc.Container'>")),
- )
+ self.assertIn("Ambiguous dispatch:", str(re_three.exception))
+ self.assertIn("<class 'collections.abc.Container'", str(re_three.exception))
+ self.assertIn("<class 'collections.abc.Sized'", str(re_three.exception))
+
class V(c.Sized, S):
def __len__(self):
return 0
... yield 1
...
>>> type(g)
-<class 'function'>
+<class 'function' ...>
>>> i = g()
>>> type(i)
-<class 'generator'>
+<class 'generator' ...>
>>> [s for s in dir(i) if not s.startswith('_')]
['close', 'gi_code', 'gi_frame', 'gi_running', 'gi_yieldfrom', 'send', 'throw']
>>> from test.support import HAVE_DOCSTRINGS
>>> i.gi_running
0
>>> type(i.gi_frame)
-<class 'frame'>
+<class 'frame' ...>
>>> i.gi_running = 42
Traceback (most recent call last):
...
>>> def f():
... yield
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f():
... if 0:
... yield
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f():
... if 0:
... yield 1
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f():
... if "":
... yield None
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f():
... return
... x = 1
... return
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f():
... if 0:
... yield 1
...
>>> type(f())
-<class 'NoneType'>
+<class 'NoneType' ...>
>>> def f():
... if 0:
... def f(self):
... yield 2
>>> type(f())
-<class 'NoneType'>
+<class 'NoneType' ...>
>>> def f():
... if 0:
... if 0:
... yield 2
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
This one caused a crash (see SF bug 567538):
>>> def f(): list(i for i in [(yield 26)])
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
A yield expression with augmented assignment.
>>> def f(): x += yield
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f(): x = yield
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f(): lambda x=(yield): 1
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f(): x=(i for i in (yield) if (yield))
>>> type(f())
-<class 'generator'>
+<class 'generator' ...>
>>> def f(d): d[(yield "a")] = d[(yield "b")] = 27
>>> data = [1,2]
>>> g = f(data)
>>> type(g)
-<class 'generator'>
+<class 'generator' ...>
>>> g.send(None)
'a'
>>> data
# so this works as expected in both ways of running regrtest.
def test_main(verbose=None):
from test import support, test_generators
+ import doctest
support.run_unittest(__name__)
- support.run_doctest(test_generators, verbose)
+ support.run_doctest(test_generators, verbose, optionflags=doctest.ELLIPSIS)
# This part isn't needed for regrtest, but for running the test directly.
if __name__ == "__main__":
>>> g = (i*i for i in range(4))
>>> type(g)
- <class 'generator'>
+ <class 'generator' ...>
>>> list(g)
[0, 1, 4, 9]
def test_main(verbose=None):
from test import support
from test import test_genexps
- support.run_doctest(test_genexps, verbose)
+ import doctest
+ support.run_doctest(test_genexps, verbose, optionflags=doctest.ELLIPSIS)
# verify reference counting
if verbose and hasattr(sys, "gettotalrefcount"):
>>> class C(object, metaclass=M, other="haha"):
... pass
...
- Prepare called: ('C', (<class 'object'>,)) {'other': 'haha'}
+ Prepare called: ('C', (<class 'object' ...>,)) {'other': 'haha'}
New called: {'other': 'haha'}
>>> C.__class__ is M
True
>>> kwds = {'metaclass': M, 'other': 'haha'}
>>> class C(*bases, **kwds): pass
...
- Prepare called: ('C', (<class 'object'>,)) {'other': 'haha'}
+ Prepare called: ('C', (<class 'object' ...>,)) {'other': 'haha'}
New called: {'other': 'haha'}
>>> C.__class__ is M
True
>>> kwds = {'other': 'haha'}
>>> class C(B, metaclass=M, *bases, **kwds): pass
...
- Prepare called: ('C', (<class 'test.test_metaclass.B'>, <class 'object'>)) {'other': 'haha'}
+ Prepare called: ('C', (<class 'test.test_metaclass.B' ...>, <class 'object' ...>)) {'other': 'haha'}
New called: {'other': 'haha'}
>>> C.__class__ is M
True
def test_main(verbose=False):
from test import support
from test import test_metaclass
- support.run_doctest(test_metaclass, verbose)
+ import doctest
+ support.run_doctest(test_metaclass, verbose, optionflags=doctest.ELLIPSIS)
if __name__ == "__main__":
test_main(verbose=True)
def test_default_dict(self):
d = collections.defaultdict(int)
- self.assertEqual(pprint.pformat(d, width=1), "defaultdict(<class 'int'>, {})")
+ self.assertRegex(pprint.pformat(d, width=1), r"defaultdict\(<class 'int' at 0x.+>, {}\)")
words = 'the quick brown fox jumped over a lazy dog'.split()
d = collections.defaultdict(int, zip(words, itertools.count()))
- self.assertEqual(pprint.pformat(d),
-"""\
-defaultdict(<class 'int'>,
+ self.assertRegex(pprint.pformat(d),
+r"""defaultdict\(<class 'int' at 0x.+>,
{'a': 6,
'brown': 2,
'dog': 8,
'lazy': 7,
'over': 5,
'quick': 1,
- 'the': 0})""")
+ 'the': 0}\)""")
def test_counter(self):
d = collections.Counter()
''')
importlib.invalidate_caches()
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import foo
- eq(repr(foo.foo),
- "<class '%s.foo'>" % foo.__name__)
+ self.assertRegex(repr(foo.foo),
+ r"<class '%s.foo' at 0x.+>" % foo.__name__)
@unittest.skip('need a suitable object')
def test_object(self):
importlib.invalidate_caches()
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import bar
# Module name may be prefixed with "test.", depending on how run.
- self.assertEqual(repr(bar.bar), "<class '%s.bar'>" % bar.__name__)
+ self.assertRegex(repr(bar.bar), r"<class '%s.bar' at 0x.+>" % bar.__name__)
def test_instance(self):
self._check_path_limitations('baz')
@unittest.skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -OO and above")
def test_doc_tests(self):
- failed, tried = doctest.testmod(statistics)
+ failed, tried = doctest.testmod(statistics, optionflags=doctest.ELLIPSIS)
self.assertGreater(tried, 0)
self.assertEqual(failed, 0)
self.assertTrue(out.endswith(
b"A server error occurred. Please contact the administrator."
))
- self.assertEqual(
+ self.assertRegex(
err.splitlines()[-2],
- "AssertionError: Headers (('Content-Type', 'text/plain')) must"
- " be of type list: <class 'tuple'>"
+ r"AssertionError: Headers \(\('Content-Type', 'text/plain'\)\) must"
+ r" be of type list: <class 'tuple' at 0x.+>"
)
def test_status_validation_errors(self):
if __name__ == "__main__":
unittest.main()
+
# 'method "this_is_not_exists" is not supported'>}]
self.assertEqual(result.results[0]['faultCode'], 1)
- self.assertEqual(result.results[0]['faultString'],
- '<class \'Exception\'>:method "this_is_not_exists" '
+ self.assertRegex(result.results[0]['faultString'],
+ '<class \'Exception\' at 0x.+>:method "this_is_not_exists" '
'is not supported')
except (xmlrpclib.ProtocolError, OSError) as e:
# ignore failures due to non-blocking socket 'unavailable' errors
- Issue #21271: New keyword only parameters in reset_mock call.
+- Issue #25548: Showing memory address of class objects in repl.
+
IDLE
----
}
if (mod != NULL && _PyUnicode_CompareWithId(mod, &PyId_builtins))
- rtn = PyUnicode_FromFormat("<class '%U.%U'>", mod, name);
- else
- rtn = PyUnicode_FromFormat("<class '%s'>", type->tp_name);
+ rtn = PyUnicode_FromFormat("<class '%U.%U' at %p>", mod, name, type);
+ else
+ rtn = PyUnicode_FromFormat("<class '%s' at %p>", type->tp_name, type);
Py_XDECREF(mod);
Py_DECREF(name);
projects / python / commitdiff