diff options
| author |   Georg Brandl <georg@python.org> | 2013-04-06 16:39:49 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-04-06 16:39:49 +0200 |
| commit | 2fd4abe6a1f54fe7a5409abf84060bae47a52044 (patch) | |
| tree | 3871af699874a89e1b687e9d1a106f880904d313 | |
| parent | Add link to glossary for hashable term in docs for set type (diff) | |
| parent | Added tag v3.2.4 for changeset 1e10bdeabe3d (diff) | |
| download | cpython-2fd4abe6a1f54fe7a5409abf84060bae47a52044.tar.gz cpython-2fd4abe6a1f54fe7a5409abf84060bae47a52044.tar.bz2 cpython-2fd4abe6a1f54fe7a5409abf84060bae47a52044.zip | |
merge with 3.2 branch
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | Doc/howto/logging-cookbook.rst | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 2 | ||||
| -rw-r--r-- | LICENSE | 1 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 6 | ||||
| -rw-r--r-- | PC/python_nt.rc | 2 | ||||
| -rw-r--r-- | README | 4 |
7 files changed, 11 insertions, 8 deletions
@@ -99,6 +99,8 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2 3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 +b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1 +1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3 diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 47406aa9eb7..cdd4b66b095 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1633,7 +1633,7 @@ UTF-8, then you need to do the following: 'ASCII section\ufeffUnicode section' - The Unicode code point ``'\ufeff'``, when encoded using UTF-8, will be + The Unicode code point U+FEFF, when encoded using UTF-8, will be encoded as a UTF-8 BOM -- the byte-string ``b'\xef\xbb\xbf'``. #. Replace the ASCII section with whatever placeholders you like, but make sure diff --git a/Doc/license.rst b/Doc/license.rst index 5b7fcbd2c4d..9e80f5dbaae 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -120,6 +120,8 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.2.3 | 3.2.2 | 2012 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 3.2.4 | 3.2.3 | 2013 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ | 3.3.0 | 3.2 | 2012 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ @@ -74,6 +74,7 @@ the various releases. 3.2.1 3.2 2011 PSF yes 3.2.2 3.2.1 2011 PSF yes 3.2.3 3.2.2 2012 PSF yes + 3.2.4 3.2.3 2013 PSF yes 3.3.0 3.2 2012 PSF yes Footnotes: diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 0885709111e..748a97b34a3 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -18,6 +18,8 @@ What's New in IDLE 3.3.1? What's New in IDLE 3.3.0? ========================= +- Issue #17625: Close the replace dialog after it is used. + - Issue #7163: Propagate return value of sys.stdout.write. - Issue #15318: Prevent writing to sys.stdin. @@ -874,7 +876,3 @@ What's New in IDLEfork 0.9 Alpha 1? Refer to HISTORY.txt for additional information on earlier releases. -------------------------------------------------------------------- - - - - diff --git a/PC/python_nt.rc b/PC/python_nt.rc index 5010baa0fb3..199533cad9d 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", "Python Core\0" VALUE "FileVersion", PYTHON_VERSION VALUE "InternalName", "Python DLL\0" - VALUE "LegalCopyright", "Copyright © 2001-2012 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright © 2001-2013 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "ProductName", "Python\0" VALUE "ProductVersion", PYTHON_VERSION @@ -167,8 +167,8 @@ See PEP 398 for release details: http://www.python.org/dev/peps/pep-0398/ Copyright and License Information --------------------------------- -Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -Python Software Foundation. All rights reserved. +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved. |