Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.2 branch

This commit is contained in:
Georg Brandl 2013-04-06 16:39:49 +02:00
parent 9a411ce9ea 11692acffa
commit 2fd4abe6a1
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -99,6 +99,8 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2 428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2
3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3
b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3

2
Doc/howto/logging-cookbook.rst
View File

@ -1633,7 +1633,7 @@ UTF-8, then you need to do the following:
'ASCII section\ufeffUnicode section' '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'``. 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 #. Replace the ASCII section with whatever placeholders you like, but make sure

2
Doc/license.rst
View File

@ -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.3 | 3.2.2 | 2012 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| 3.2.4 | 3.2.3 | 2013 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
| 3.3.0 | 3.2 | 2012 | PSF | yes | | 3.3.0 | 3.2 | 2012 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+

1
LICENSE
View File

@ -74,6 +74,7 @@ the various releases.
3.2.1 3.2 2011 PSF yes 3.2.1 3.2 2011 PSF yes
3.2.2 3.2.1 2011 PSF yes 3.2.2 3.2.1 2011 PSF yes
3.2.3 3.2.2 2012 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 3.3.0 3.2 2012 PSF yes
Footnotes: Footnotes:

6
Lib/idlelib/NEWS.txt
View File

@ -18,6 +18,8 @@ What's New in IDLE 3.3.1?
What's New in IDLE 3.3.0? 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 #7163: Propagate return value of sys.stdout.write.
- Issue #15318: Prevent writing to sys.stdin. - 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. Refer to HISTORY.txt for additional information on earlier releases.
-------------------------------------------------------------------- --------------------------------------------------------------------

2
PC/python_nt.rc
View File

@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0" VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0" 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 "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0" VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION VALUE "ProductVersion", PYTHON_VERSION

4
README
View File

@ -167,8 +167,8 @@ See PEP 398 for release details: http://www.python.org/dev/peps/pep-0398/
Copyright and License Information Copyright and License Information
--------------------------------- ---------------------------------
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
Python Software Foundation. All rights reserved. 2012, 2013 Python Software Foundation. All rights reserved.
Copyright (c) 2000 BeOpen.com. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved.