merge mostly from default

5 files changed, 45 insertions, 127 deletions

diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index a674dd6e33..a84d44d618 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1127,7 +1127,7 @@ datetime
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
    older than 1000.
- * XXX The :meth:`datetime.datetime.astimezone` method can now be
+ * The :meth:`datetime.datetime.astimezone` method can now be
    called without arguments to convert datetime instance to the system
    timezone.
 
@@ -1534,6 +1534,15 @@ sched
   :issue:`13245`)
 
 
+shlex
+-----
+
+* The previously undocumented helper function ``quote`` from the
+  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
+  documented.  :func:`~shlex.quote` properly escapes all characters in a string
+  that might be otherwise given special meaning by the shell.
+
+
 shutil
 ------
 
@@ -1565,7 +1574,6 @@ shutil
   in :issue:`4489`.)
 
 
-
 signal
 ------
 
@@ -1588,14 +1596,27 @@ signal
 * :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError,
   instead of a RuntimeError: OSError has an errno attribute.
 
+
+smtpd
+-----
+
+* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+  (size extension).  Per the standard, these extensions are enabled if and only
+  if the client initiates the session with an ``EHLO`` command.
+
+  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+  Jauhiainen.  Substantial additional work on the patch contributed by Michele
+  Orrù and Dan Boswell.  :issue:`8739`)
+
+
 smtplib
 -------
 
-The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-method now accept an SSLContext parameter to control parameters of the secure
-channel.
+* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+  method now accept an SSLContext parameter to control parameters of the secure
+  channel.
 
-(Contributed by Kasun Herath in :issue:`8809`)
+  (Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -2070,14 +2091,16 @@ Building C extensions
   (implemented in :issue:`14040`.)
 
 
-Other issues
-------------
+Command Line Switch Changes
+---------------------------
+
+* The -Q command-line flag and related artifacts have been removed.  Code
+  checking sys.flags.division_warning will need updating.
+
+  (:issue:`10998`, contributed by Éric Araujo.)
 
-.. Issue #11591: When :program:`python` was started with :option:`-S`,
-   ``import site`` will not add site-specific paths to the module search
-   paths.  In previous versions, it did.  See changeset for doc changes in
-   various files.  Contributed by Carl Meyer with editions by Éric Araujo.
+* When :program:`python` is started with :option:`-S`, ``import site``
+  will no longer add site-specific paths to the module search paths.  In
+  previous versions, it did.
 
-.. Issue #10998: the -Q command-line flag and related artifacts have been
-   removed.  Code checking sys.flags.division_warning will need updating.
-   Contributed by Éric Araujo.
+  (:issue:`11591`, contributed by Carl Meyer with editions by Éric Araujo.)
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 3da972089d..b5919a4f21 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0"
+#define PY_VERSION      	"3.3.0+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 2920a2935f..6e0c6eef31 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -585,7 +585,7 @@ class SysModuleTest(unittest.TestCase):
     def test_implementation(self):
         # This test applies to all implementations equally.
 
-        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'release': 0xF}
+        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'final': 0xF}
 
         self.assertTrue(hasattr(sys.implementation, 'name'))
         self.assertTrue(hasattr(sys.implementation, 'version'))
diff --git a/Misc/NEWS b/Misc/NEWS
index 2ef8405fe5..f385ede64b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,117 +5,14 @@ Python News
 What's New in Python 3.3.1?
 ===========================
 
-*Release date: XX-XX-XXXX*
+*Release date: XX-XXX-2012*
 
 Core and Builtins
 -----------------
 
-- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
-  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
-
-- Issue #15144: Fix possible integer overflow when handling pointers as
-  integer values, by using Py_uintptr_t instead of size_t.  Patch by
-  Serhiy Storchaka.
-
-- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
-  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
-
-- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
-
-- Issue #15846: Fix SystemError which happened when using ast.parse in an
-  exception handler on code with syntax errors.
-
-- Issue #15801: Make sure mappings passed to '%' formatting are actually
-  subscriptable.
-
 Library
 -------
 
-- Issue #15323: improve failure message of Mock.assert_called_once_with
-
-- Issue #16064: unittest -m claims executable is "python", not "python3"
-
-- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
-
-- Issue #15222: Insert blank line after each message in mbox mailboxes
-
-- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
-  Patch by Serhiy Storchaka.
-
-- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
-  datetime.MAXYEAR.  Patch by Cédric Krier.
-
-- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
-  elements 'meta' and 'param'.
-
-- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
-  raise ValueError when the file-like object is closed.  Patch by Alessandro
-  Moura.
-
-- Issue #15876: Fix a refleak in the curses module: window.encoding.
-
-- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
-  by Chris McDonough.
-
-- Issue #15340: Fix importing the random module when /dev/urandom cannot
-  be opened.  This was a regression caused by the hash randomization patch.
-
-- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
-  and StringIO objects now raise ValueError when the object has been closed.
-  Patch by Alessandro Moura.
-
-- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
-  os.devnull explicitly and leaving it open.
-
-- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
-  Popen when %action substitutions produce empty strings.
-
-- Issue #12776,#11839: call argparse type function (specified by add_argument)
-  only once. Before, the type function was called twice in the case where the
-  default was specified and the argument was given as well.  This was
-  especially problematic for the FileType type, as a default file would always
-  be opened, even if a file argument was specified on the command line.
-
-- Issue #15906: Fix a regression in argparse caused by the preceding change,
-  when action='append', type='str' and default=[].
-
-Extension Modules
------------------
-
-Tests
------
-
-- Issue #15304: Fix warning message when os.chdir() fails inside
-  test.support.temp_cwd().  Patch by Chris Jerdonek.
-
-
-- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
-  by Serhiy Storchaka.
-
-- Issue #15557: Added a test suite for the webbrowser module, thanks
-  to Anton Barkovsky.
-
-Build
------
-
-- Issue #15819: Make sure we can build Python out-of-tree from a readonly
-  source directory.  (Somewhat related to Issue #9860.)
-
-Documentation
--------------
-
-- Issue #16036: Improve documentation of built-in int()'s signature and
-  arguments.
-
-- Issue #15935: Clarification of argparse docs, re: add_argument() type and
-  default arguments.  Patch contributed by Chris Jerdonek.
-
-- Issue #11964: Document a change in v3.2 to the behavior of the indent
-  parameter of json encoding operations.
-
-Tools/Demos
------------
-
 
 What's New in Python 3.3.0?
 ===========================
@@ -287,6 +184,8 @@ Library
 
 - Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs.
 
+- Issue #15776: Allow pyvenv to work in existing directory with --clean.
+
 - Issue #15249: BytesGenerator now correctly mangles From lines (when
   requested) even if the body contains undecodable bytes.
 
@@ -303,9 +202,6 @@ Library
 
 - Issue #13579: string.Formatter now understands the 'a' conversion specifier.
 
-- Issue #15793: Stack corruption in ssl.RAND_egd().
-  Patch by Serhiy Storchaka.
-
 - Issue #15595: Fix subprocess.Popen(universal_newlines=True)
   for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek.
 
@@ -644,9 +540,6 @@ C API
 Extension Modules
 -----------------
 
-- Issue #15676: Now "mmap" check for empty files before doing the
-  offset check.  Patch by Steven Willis.
-
 - Issue #6493: An issue in ctypes on Windows that caused structure bitfields
   of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed.
 
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d46270c20c..2057bebce3 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -977,6 +977,8 @@ def add_files(db):
     launchersrc = PCBUILD
     if launchersrc.lower() == 'pcbuild\\x64-pgo':
         launchersrc = 'PCBuild\\win32-pgo'
+    if launchersrc.lower() == 'pcbuild\\amd64':
+        launchersrc = 'PCBuild'
     launcher = os.path.join(srcdir, launchersrc, "py.exe")
     launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
     launcherdir.add_file(launcher,