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.

diff --git a/Lib/idlelib/CallTips.py b/Lib/idlelib/CallTips.py
index 65e67d7189a86e26a49f088121a3e7a4c06fc461..67d97d27bbb7811653fde71f5ab632c92fe437a9 100644 (file)
--- 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 aa9fb24c05ccf09c208b70f086d459e9153053be..27ef39fbe6ce86268900f2325d6548961cca8dd3 100644 (file)
--- 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 5a0e900ed02b2d534cf9c095f6f197f3f979befe..0f11ae2f2abc8a090d68de56bb443c62a8971173 100644 (file)
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.0rc1"
+IDLE_VERSION = "1.0rc2"