summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_metaclass.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-07-14 04:13:29 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-07-14 04:13:29 (GMT)
commitab078e9ed1a5d1b693d6ee843f1a34e8993e9dee (patch)
tree55e6e21b81315f126e76357af7e545cfe498d778 /Lib/test/test_metaclass.py
parentfb4f8257bfa4471764e10c1d8525a5bb7b0145e5 (diff)
downloadcpython-ab078e9ed1a5d1b693d6ee843f1a34e8993e9dee.zip
cpython-ab078e9ed1a5d1b693d6ee843f1a34e8993e9dee.tar.gz
cpython-ab078e9ed1a5d1b693d6ee843f1a34e8993e9dee.tar.bz2
Backed out changeset af29d89083b3 (closes #25548) (closes #27498)
Diffstat (limited to 'Lib/test/test_metaclass.py')
-rw-r--r--Lib/test/test_metaclass.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_metaclass.py b/Lib/test/test_metaclass.py
index be683dd..e6fe20a 100644
--- a/Lib/test/test_metaclass.py
+++ b/Lib/test/test_metaclass.py
@@ -78,7 +78,7 @@ Also pass another keyword.
>>> 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
@@ -104,7 +104,7 @@ Use various combinations of explicit keywords and **kwds.
>>> 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
@@ -114,7 +114,7 @@ Use various combinations of explicit keywords and **kwds.
>>> 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
@@ -259,8 +259,7 @@ else:
def test_main(verbose=False):
from test import support
from test import test_metaclass
- import doctest
- support.run_doctest(test_metaclass, verbose, optionflags=doctest.ELLIPSIS)
+ support.run_doctest(test_metaclass, verbose)
if __name__ == "__main__":
test_main(verbose=True)