summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2003-07-23 15:42:14 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2003-07-23 15:42:14 (GMT)
commit6145a624b8d9232f54eef3cb64777c4ba4c471f4 (patch)
tree80cf9d09c6e44f62b37b516f47a945613e159984
parenta3788642a3dd46d8efa1a424781c2dcb643b2952 (diff)
downloadcpython-6145a624b8d9232f54eef3cb64777c4ba4c471f4.zip
cpython-6145a624b8d9232f54eef3cb64777c4ba4c471f4.tar.gz
cpython-6145a624b8d9232f54eef3cb64777c4ba4c471f4.tar.bz2
1. Python Bug 775541: Calltips error when docstring is None. Introduced
by patch 769142. Fixed by patch 776062. KBK will backport net result to IDLE release22-maint and IDLEfork. 2. Update NEWS.txt and idlever for release.
-rw-r--r--Lib/idlelib/CallTips.py3
-rw-r--r--Lib/idlelib/NEWS.txt11
-rw-r--r--Lib/idlelib/idlever.py2
3 files changed, 12 insertions, 4 deletions
diff --git a/Lib/idlelib/CallTips.py b/Lib/idlelib/CallTips.py
index 65e67d7..67d97d2 100644
--- a/Lib/idlelib/CallTips.py
+++ b/Lib/idlelib/CallTips.py
@@ -162,8 +162,9 @@ def get_arg_text(ob):
except:
pass
# See if we can use the docstring
- doc = getattr(ob, "__doc__", "").lstrip()
+ doc = getattr(ob, "__doc__", "")
if doc:
+ doc = doc.lstrip()
pos = doc.find("\n")
if pos < 0 or pos > 70:
pos = 70
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index aa9fb24..27ef39f 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,7 +1,14 @@
-What's New in IDLE 1.0rc1?
+What's New in IDLE 1.0 release candidate 2?
===================================
-*Release date: 17-Jul-2003*
+*Release date: 24-Jul-2003*
+
+- Calltip error when docstring was None Python Bug 775541
+
+What's New in IDLE 1.0 release candidate 1?
+===================================
+
+*Release date: 18-Jul-2003*
- Updated extend.txt, help.txt, and config-extensions.def to correctly
reflect the current status of the configuration system. Python Bug 768469
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 5a0e900..0f11ae2 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.0rc1"
+IDLE_VERSION = "1.0rc2"