Merge from 3.4.2 release head back into 3.4 mainline.

larryhastings · larryhastings · commit 2ce95d7b7c62 · 2014-10-08T02:50:50.000-07:00
diff --git a/.hgtags b/.hgtags
@@ -137,3 +137,4 @@ a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2
 c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1
 c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
 8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1
+ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
@@ -1864,7 +1864,7 @@ expression support in the :mod:`re` module).
    For example::
 
       >>> 'ab c\n\nde fg\rkl\r\n'.splitlines()
-      ['ab c', '', 'de fg', 'kl']``
+      ['ab c', '', 'de fg', 'kl']
       >>> 'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
       ['ab c\n', '\n', 'de fg\r', 'kl\r\n']
 
@@ -2932,7 +2932,7 @@ place, and instead produce new objects.
    For example::
 
       >>> b'ab c\n\nde fg\rkl\r\n'.splitlines()
-      [b'ab c', b'', b'de fg', b'kl']``
+      [b'ab c', b'', b'de fg', b'kl']
       >>> b'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
       [b'ab c\n', b'\n', b'de fg\r', b'kl\r\n']
 
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
@@ -256,11 +256,6 @@ whatsnew/2.4,,:System,
 whatsnew/2.5,,:memory,:memory:
 whatsnew/2.5,,:step,[start:stop:step]
 whatsnew/2.5,,:stop,[start:stop:step]
-whatsnew/2.7,1619,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]',"
-whatsnew/2.7,1619,::,>>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo')
-whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
-whatsnew/2.7,862,:Cookie,"export PYTHONWARNINGS=all,error:::Cookie:0"
-whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
 whatsnew/3.2,,:affe,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
 whatsnew/3.2,,:affe,>>> urllib.parse.urlparse('http://[dead:beef:cafe:5417:affe:8FA3:deaf:feed]/foo/')
 whatsnew/3.2,,:beef,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
@@ -282,3 +277,8 @@ whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised Unic
 whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""."
 whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
 whatsnew/changelog,,:password,user:password
+whatsnew/2.7,780,:Sunday,'2009:4:Sunday'
+whatsnew/2.7,907,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
+whatsnew/2.7,907,:Cookie,"export PYTHONWARNINGS=all,error:::Cookie:0"
+whatsnew/2.7,1657,::,>>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo')
+whatsnew/2.7,1657,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]',"
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	4
 #define PY_MICRO_VERSION	2
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.4.2rc1+"
+#define PY_VERSION      	"3.4.2+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.2rc1"
+__version__ = "3.4.2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.4.2rc1"
+IDLE_VERSION = "3.4.2"
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -3,8 +3,10 @@ Python News
 +++++++++++
 
 
-What's New in Python 3.4.3?
-===========================
+What's New in Python 3.4.3rc1?
+==============================
+
+Release date: TBA
 
 Core and Builtins
 -----------------
diff --git a/Misc/RPM/python-3.4.spec b/Misc/RPM/python-3.4.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.4.2rc1
+%define version 3.4.2
 %define libvers 3.4
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
@@ -1,5 +1,5 @@
-This is Python version 3.4.2rc1
-===============================
+This is Python version 3.4.2
+============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012, 2013, 2014 Python Software Foundation.  All rights reserved.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
@@ -1158,7 +1158,7 @@ def add_files(db):
     for f in ['i18n', 'pynche', 'Scripts']:
         lib = PyDirectory(db, cab, tooldir, f, f, "%s|%s" % (tooldir.make_short(f), f))
         lib.glob("*.py")
-        lib.glob("*.pyw", exclude=['pydocgui.pyw'])
+        lib.glob("*.pyw")
         lib.remove_pyc()
         lib.glob("*.txt")
         if f == "pynche":
@@ -1170,9 +1170,6 @@ def add_files(db):
             lib.add_file("2to3.py", src="2to3")
             lib.add_file("pydoc3.py", src="pydoc3")
             lib.add_file("pyvenv.py", src="pyvenv")
-            if have_tcl:
-                lib.start_component("pydocgui.pyw", tcltk, keyfile="pydocgui.pyw")
-                lib.add_file("pydocgui.pyw")
     # Add documentation
     htmlfiles.set_current()
     lib = PyDirectory(db, cab, root, "Doc", "Doc", "DOC|Doc")

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`# Updated automatically by the Python release process.`
`14`	`14`	`#`
`15`	`15`	`#--start constants--`
`16`		`-__version__ = "3.4.2rc1"`
	`16`	`+__version__ = "3.4.2"`
`17`	`17`	`#--end constants--`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-IDLE_VERSION = "3.4.2rc1"`
	`1`	`+IDLE_VERSION = "3.4.2"`