[Python-checkins] cpython (merge 3.2 -> 3.3): merge with 3.2 branch
georg.brandl
python-checkins at python.org
Sat Apr 6 16:44:22 CEST 2013
http://hg.python.org/cpython/rev/86edad2058ed
changeset: 83135:86edad2058ed
branch: 3.3
parent: 83112:a7f65fface40
parent: 83134:7680dbf5cb3f
user: Georg Brandl <georg at python.org>
date: Sat Apr 06 16:39:49 2013 +0200
summary:
merge with 3.2 branch
files:
.hgtags | 2 ++
Doc/howto/logging-cookbook.rst | 2 +-
Doc/license.rst | 2 ++
LICENSE | 1 +
Lib/idlelib/NEWS.txt | 6 ++----
PC/python_nt.rc | 2 +-
README | 4 ++--
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -99,6 +99,8 @@
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
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1633,7 +1633,7 @@
'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
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -120,6 +120,8 @@
+----------------+--------------+------------+------------+-----------------+
| 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 |
+----------------+--------------+------------+------------+-----------------+
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -74,6 +74,7 @@
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
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -18,6 +18,8 @@
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 @@
Refer to HISTORY.txt for additional information on earlier releases.
--------------------------------------------------------------------
-
-
-
-
diff --git a/PC/python_nt.rc b/PC/python_nt.rc
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -61,7 +61,7 @@
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
diff --git a/README b/README
--- a/README
+++ b/README
@@ -167,8 +167,8 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list