Merged revisions 59680-59695 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59686 | guido.van.rossum | 2008-01-04 00:54:04 +0100 (Fri, 04 Jan 2008) | 2 lines

  Bug #1301: fixed a bad assert in _tkinter.
........
  r59687 | raymond.hettinger | 2008-01-04 01:01:15 +0100 (Fri, 04 Jan 2008) | 3 lines

  Finish-up the struct module optimizations started at the Iceland NFS sprint.
........
  r59688 | christian.heimes | 2008-01-04 01:04:52 +0100 (Fri, 04 Jan 2008) | 1 line

  Fixed #1687: plistlib.py restricts <integer> to Python int when writing
........
  r59689 | christian.heimes | 2008-01-04 01:37:34 +0100 (Fri, 04 Jan 2008) | 1 line

  Bug #1481296: Fixed long(float('nan'))!=0L.
........
  r59691 | andrew.kuchling | 2008-01-04 02:15:50 +0100 (Fri, 04 Jan 2008) | 1 line

  Markup fixes; grammar tweaks
........
  r59692 | andrew.kuchling | 2008-01-04 02:16:12 +0100 (Fri, 04 Jan 2008) | 1 line

  Add items
........
  r59694 | christian.heimes | 2008-01-04 02:48:50 +0100 (Fri, 04 Jan 2008) | 1 line

  Fixed math.copysign() on Windows
........
  r59695 | christian.heimes | 2008-01-04 03:03:25 +0100 (Fri, 04 Jan 2008) | 1 line

  Filled in some XXX comments
........

2 files changed, 46 insertions, 11 deletions

diff --git a/Doc/library/msvcrt.rst b/Doc/library/msvcrt.rst
index 9fa49da..a305788 100644
--- a/Doc/library/msvcrt.rst
+++ b/Doc/library/msvcrt.rst
@@ -101,9 +101,9 @@ Console I/O
    
 .. function:: getwch()
 
-   Wide char variant of `func:getch`, returns unicode.
+   Wide char variant of :func:`getch`, returning a Unicode value.
    
-   ..versionadded:: 2.6
+   .. versionadded:: 2.6
    
 
 .. function:: getche()
@@ -114,9 +114,9 @@ Console I/O
 
 .. function:: getwche()
 
-   Wide char variant of `func:getche`, returns unicode.
+   Wide char variant of :func:`getche`, returning a Unicode value.
    
-   ..versionadded:: 2.6
+   .. versionadded:: 2.6
 
 
 .. function:: putch(char)
@@ -126,9 +126,9 @@ Console I/O
    
 .. function:: putwch(unicode_char)
 
-   Wide char variant of `func:putch`, accepts unicode.
+   Wide char variant of :func:`putch`, accepting a Unicode value.
    
-   ..versionadded:: 2.6
+   .. versionadded:: 2.6
    
 
 .. function:: ungetch(char)
@@ -139,9 +139,9 @@ Console I/O
    
 .. function:: ungetwch(unicode_char)
 
-   Wide char variant of `func:ungetch`, accepts unicode.
+   Wide char variant of :func:`ungetch`, accepting a Unicode value.
    
-   ..versionadded:: 2.6
+   .. versionadded:: 2.6
 
 
 .. _msvcrt-other:
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 4a8eb76..7bd9cbd 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -552,6 +552,14 @@ Here are all of the changes that Python 2.6 makes to the core Python language.
 
   .. Patch 1507
 
+* More floating-point features were also added.  The :func:`float` function
+  will now turn the strings ``+nan`` and ``-nan`` into the corresponding
+  IEEE 754 Not a Number values, and ``+inf`` and ``-inf`` into 
+  positive or negative infinity.  This works on any platform with 
+  IEEE 754 semantics.  (Contributed by Christian Heimes.)
+
+  .. Patch 1635.
+
 * Changes to the :class:`Exception` interface
   as dictated by :pep:`352` continue to be made.  For 2.6, 
   the :attr:`message` attribute is being deprecated in favor of the
@@ -1055,14 +1063,35 @@ Changes to Python's build process and to the C API include:
   ``"mant_dig"`` (number of digits in the mantissa), ``"epsilon"``
   (smallest difference between 1.0 and the next largest value
   representable), and several others.
+  (Contributed by Christian Heimes.)
 
   .. Issue 1534
 
+* Python's C API now includes two functions for case-insensitive string
+  comparisions, ``PyOS_stricmp(char*, char*)``
+  and ``PyOS_strnicmp(char*, char*, Py_ssize_t)``.
+  (Contributed by Christian Heimes.)
+
+  .. Issue 1635
+
+* Some macros were renamed.  :cmacro:`Py_Size()` became :cmacro:`Py_SIZE()`,
+  :cmacro:`Py_Type()` became :cmacro:`Py_TYPE()`, and
+  :cmacro:`Py_Refcnt()` became :cmacro:`Py_REFCNT()`.  Macros for backward
+  compatibility are still available for Python 2.6.
+
+  .. Issue 1629: XXX why was this done?
+
 .. ======================================================================
 
 
-Port-Specific Changes
----------------------
+Port-Specific Changes: Windows
+-----------------------------------
+
+* The :mod:`msvcrt` module now supports 
+  both the normal and wide char variants of the console I/O
+  API.  The :func:`getwch` function reads a keypress and returns a Unicode 
+  value, as does the :func:`getwche` function.  The :func:`putwch` function
+  takes a Unicode character and writes it to the console.
 
 Platform-specific changes go here.
 
@@ -1089,9 +1118,15 @@ Some of the more notable changes are:
 Porting to Python 2.6
 =====================
 
-This section lists previously described changes that may require changes to your
+This section lists previously described changes, and a few
+esoteric bugfixes, that may require changes to your
 code:
 
+* The :method:`__init__` method of :class:`collections.deque`
+  now clears any existing contents of the deque
+  before adding elements from the iterable.  This change makes the
+  behavior match that of ``list.__init__()``.  
+
 * The :mod:`socket` module exception :exc:`socket.error` now inherits
   from :exc:`IOError`.  Previously it wasn't a subclass of
   :exc:`StandardError` but now it is, through :exc:`IOError`.