Skip to content

Commit a1402b9

Browse files
yihong0618sobolevn
andauthored
Apply suggestions from code review
Co-authored-by: sobolevn <[email protected]>
1 parent 2b31614 commit a1402b9

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Lib/inspect.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -820,10 +820,8 @@ def getfile(object):
820820
if getattr(object, '__file__', None):
821821
return object.__file__
822822
if object.__spec__ is not None:
823-
raise TypeError('{!r} is a built-in module'.format(object))
824-
else:
825-
raise TypeError('Custom module: {!r} cannot get source'
826-
.format(object))
823+
raise TypeError(f'{object!r} is a built-in module')
824+
raise TypeError(f'Custom module: {object!r} cannot get source')
827825
if isclass(object):
828826
if hasattr(object, '__module__'):
829827
module = sys.modules.get(object.__module__)

Lib/test/test_inspect/test_inspect.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -812,11 +812,13 @@ def test_getfile_builtin_module(self):
812812
self.assertStartsWith(str(e.exception), '<module')
813813

814814
def test_getfile_custom_module(self):
815-
import types
815+
import re
816816
custom_module = types.ModuleType('custom_module')
817-
with self.assertRaises(TypeError) as e:
817+
msg = re.escape(
818+
f'Custom module: {custom_module!r} cannot get source'
819+
)
820+
with self.assertRaisesRegex(TypeError, msg) as e:
818821
inspect.getfile(custom_module)
819-
self.assertStartsWith(str(e.exception), 'Custom module')
820822

821823
def test_getfile_builtin_class(self):
822824
with self.assertRaises(TypeError) as e:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
the error message when when inspect getfile a custom module
1+
Fix :func:`inspect.getfile` error message for custom module objects.

0 commit comments

Comments
 (0)