From 4a0430166bdf9afd04b9e6bd00f43080bc57d00b Mon Sep 17 00:00:00 2001 From: R David Murray Date: Fri, 6 Sep 2013 13:08:08 -0400 Subject: [PATCH] #18852: Handle readline.__doc__ being None in site.py readline activation. Patch by Berker Peksag. --- Lib/site.py | 5 +++-- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/site.py b/Lib/site.py index 77d198a55b2..c4ea6f6adb9 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -388,8 +388,9 @@ def enablerlcompleter(): return # Reading the initialization (config) file may not be enough to set a - # completion key, so we set one first and then read the file - if 'libedit' in getattr(readline, '__doc__', ''): + # completion key, so we set one first and then read the file. + readline_doc = getattr(readline, '__doc__', '') + if readline_doc is not None and 'libedit' in readline_doc: readline.parse_and_bind('bind ^I rl_complete') else: readline.parse_and_bind('tab: complete') diff --git a/Misc/NEWS b/Misc/NEWS index 67788c911eb..e235e7dfb0e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -56,6 +56,9 @@ Core and Builtins Library ------- +- Issue #18852: Handle case of ``readline.__doc__`` being ``None`` in the new + readline activation code in ``site.py``. + - Issue #18672: Fixed format specifiers for Py_ssize_t in debugging output in the _sre moduel.