summaryrefslogtreecommitdiffstats
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-05-31 05:01:00 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-05-31 05:01:00 (GMT)
commitd6bfa94493b897f45ab939208a4a54a259a530e8 (patch)
treeacb88e88abfbb21a554dc7205cf2e339a85d5d7c /Lib/inspect.py
parent59ea508bb84006b8e93ff036aa8d9f0a3fa232c7 (diff)
downloadcpython-d6bfa94493b897f45ab939208a4a54a259a530e8.zip
cpython-d6bfa94493b897f45ab939208a4a54a259a530e8.tar.gz
cpython-d6bfa94493b897f45ab939208a4a54a259a530e8.tar.bz2
Issue #21853: Fixed the inspect module in unicode disabled build.
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 9336943..b08e145 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -969,8 +969,13 @@ def getcallargs(func, *positional, **named):
assign(varkw, named)
elif named:
unexpected = next(iter(named))
- if isinstance(unexpected, unicode):
- unexpected = unexpected.encode(sys.getdefaultencoding(), 'replace')
+ try:
+ unicode
+ except NameError:
+ pass
+ else:
+ if isinstance(unexpected, unicode):
+ unexpected = unexpected.encode(sys.getdefaultencoding(), 'replace')
raise TypeError("%s() got an unexpected keyword argument '%s'" %
(f_name, unexpected))
unassigned = num_args - len([arg for arg in args if is_assigned(arg)])