diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-22 12:00:37 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-22 12:00:37 (GMT) |
| commit | 521e5860a5c121700e6ccc5f07053d21b83652df (patch) | |
| tree | 242d90c511e3fbe9f2c09073429351ab02bd7693 /Lib/test | |
| parent | c09e9752c689338efff252408f38a77683a12cb4 (diff) | |
| download | cpython-521e5860a5c121700e6ccc5f07053d21b83652df.zip cpython-521e5860a5c121700e6ccc5f07053d21b83652df.tar.gz cpython-521e5860a5c121700e6ccc5f07053d21b83652df.tar.bz2 | |
Issue #22032: __qualname__ instead of __name__ is now always used to format
fully qualified class names of Python implemented classes.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_configparser.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_io.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_traceback.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_zipimport_support.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py index 78bd315..742b12b 100644 --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -579,7 +579,7 @@ boolean {0[0]} NO return e else: self.fail("expected exception type %s.%s" - % (exc.__module__, exc.__name__)) + % (exc.__module__, exc.__qualname__)) def test_boolean(self): cf = self.fromstring( diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index bda59bb..91ba551 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -778,7 +778,7 @@ class CommonBufferedTests: def test_repr(self): raw = self.MockRawIO() b = self.tp(raw) - clsname = "%s.%s" % (self.tp.__module__, self.tp.__name__) + clsname = "%s.%s" % (self.tp.__module__, self.tp.__qualname__) self.assertEqual(repr(b), "<%s>" % clsname) raw.name = "dummy" self.assertEqual(repr(b), "<%s name='dummy'>" % clsname) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index c295563..e3b28bd 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -92,9 +92,9 @@ class SyntaxTracebackCases(unittest.TestCase): self.assertEqual(len(err), 1) str_value = '<unprintable %s object>' % X.__name__ if X.__module__ in ('__main__', 'builtins'): - str_name = X.__name__ + str_name = X.__qualname__ else: - str_name = '.'.join([X.__module__, X.__name__]) + str_name = '.'.join([X.__module__, X.__qualname__]) self.assertEqual(err[0], "%s: %s\n" % (str_name, str_value)) def test_without_exception(self): diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py index 84ba5e0..43d0da6 100644 --- a/Lib/test/test_zipimport_support.py +++ b/Lib/test/test_zipimport_support.py @@ -39,7 +39,7 @@ def _run_object_doctest(obj, module): # Use the object's fully qualified name if it has one # Otherwise, use the module's name try: - name = "%s.%s" % (obj.__module__, obj.__name__) + name = "%s.%s" % (obj.__module__, obj.__qualname__) except AttributeError: name = module.__name__ for example in finder.find(obj, name, module): |