merge with 3.3

6 files changed, 20 insertions, 19 deletions

diff --git a/.hgtags b/.hgtags
index bed2c42..a02c774 100644
--- a/.hgtags
+++ b/.hgtags
@@ -115,6 +115,7 @@ bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
 92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
 d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
 d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
+fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
 46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index 4fc8c5c..2920aa1 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -532,7 +532,7 @@ of partial coding sequences.  The work of implementing this has already been
 done for you: the built-in :func:`open` function can return a file-like object
 that assumes the file's contents are in a specified encoding and accepts Unicode
 parameters for methods such as :meth:`~io.TextIOBase.read` and
-:meth:`~io.TextIOBase.write`.  This works through:func:`open`\'s *encoding* and
+:meth:`~io.TextIOBase.write`.  This works through :func:`open`\'s *encoding* and
 *errors* parameters which are interpreted just like those in :meth:`str.encode`
 and :meth:`bytes.decode`.
 
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 6a72759..f3197eb 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1974,7 +1974,7 @@ with the :class:`Pool` class.
    .. versionadded:: 3.3
       Pool objects now support the context manager protocol -- see
       :ref:`typecontextmanager`.  :meth:`~contextmanager.__enter__` returns the
-      pool object, and :meth:~contextmanager.`__exit__` calls :meth:`terminate`.
+      pool object, and :meth:`~contextmanager.__exit__` calls :meth:`terminate`.
 
 
 .. class:: AsyncResult
@@ -2147,7 +2147,7 @@ multiple connections at the same time.
    .. versionadded:: 3.3
       Listener objects now support the context manager protocol -- see
       :ref:`typecontextmanager`.  :meth:`~contextmanager.__enter__` returns the
-      listener object, and :meth:~contextmanager.`__exit__` calls :meth:`close`.
+      listener object, and :meth:`~contextmanager.__exit__` calls :meth:`close`.
 
 .. function:: wait(object_list, timeout=None)
 
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
index d951dad..57b1f1e 100644
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -18,14 +18,14 @@ faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,y
 faq/windows,,:bd8afb90ebf2,"Python 3.3.0 (v3.3.0:bd8afb90ebf2, Sep 29 2012, 10:55:48) [MSC v.1600 32 bit (Intel)] on win32"
 howto/cporting,,:encode,"if (!PyArg_ParseTuple(args, ""O:encode_object"", &myobj))"
 howto/cporting,,:say,"if (!PyArg_ParseTuple(args, ""U:say_hello"", &name))"
-howto/curses,,:black,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
-howto/curses,,:blue,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
-howto/curses,,:cyan,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
-howto/curses,,:green,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
-howto/curses,,:magenta,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
-howto/curses,,:red,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
-howto/curses,,:white,"7:white."
-howto/curses,,:yellow,"They are: 0:black, 1:red, 2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and"
+howto/curses,,:black,"colors when it activates color mode.  They are: 0:black, 1:red,"
+howto/curses,,:red,"colors when it activates color mode.  They are: 0:black, 1:red,"
+howto/curses,,:green,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white.  The"
+howto/curses,,:yellow,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white.  The"
+howto/curses,,:blue,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white.  The"
+howto/curses,,:magenta,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white.  The"
+howto/curses,,:cyan,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white.  The"
+howto/curses,,:white,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white.  The"
 howto/ipaddress,,:DB8,>>> ipaddress.ip_address('2001:DB8::1')
 howto/ipaddress,,::,>>> ipaddress.ip_address('2001:DB8::1')
 howto/ipaddress,,:db8,IPv6Address('2001:db8::1')
@@ -88,7 +88,6 @@ howto/urllib2,,:example,"for example ""joe@password:example.com"""
 library/audioop,,:ipos,"# factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)],"
 library/bisect,32,:hi,all(val >= x for val in a[i:hi])
 library/bisect,42,:hi,all(val > x for val in a[i:hi])
-library/concurrent.futures,,:url,"future_to_url = {executor.submit(load_url, url, 60):url for url in URLS}"
 library/configparser,,:home,my_dir: ${Common:home_dir}/twosheds
 library/configparser,,:option,${section:option}
 library/configparser,,:path,python_dir: ${Frameworks:path}/Python/Versions/${Frameworks:Python}
@@ -206,9 +205,9 @@ library/urllib.request,,:close,Connection:close
 library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang=""en"" lang=""en"">\n\n<head>\n"
 library/urllib.request,,:password,"""joe:password@python.org"""
 library/uuid,,:uuid,urn:uuid:12345678-1234-5678-1234-567812345678
-library/venv,,:param,":param nodist: If True, Distribute is not installed into the created"
+library/venv,,:param,":param nodist: If True, setuptools and pip are not installed into the"
+library/venv,,:param,":param progress: If setuptools or pip are installed, the progress of the"
 library/venv,,:param,":param nopip: If True, pip is not installed into the created"
-library/venv,,:param,":param progress: If Distribute or pip are installed, the progress of the"
 library/venv,,:param,:param context: The information for the environment creation request
 library/xmlrpc.client,,:pass,http://user:pass@host:port/path
 library/xmlrpc.client,,:pass,user:pass
@@ -242,6 +241,7 @@ using/cmdline,,:line,action:message:category:module:line
 using/cmdline,,:line,file:line: category: message
 using/cmdline,,:message,action:message:category:module:line
 using/cmdline,,:module,action:message:category:module:line
+using/unix,,:Packaging,http://en.opensuse.org/Portal:Packaging
 whatsnew/2.0,418,:len,
 whatsnew/2.3,,::,
 whatsnew/2.3,,:config,
@@ -276,9 +276,7 @@ whatsnew/3.2,,:gz,">>> with tarfile.open(name='myarchive.tar.gz', mode='w:gz') a
 whatsnew/3.2,,:location,zope9-location = ${zope9:location}
 whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf
 whatsnew/changelog,,:platform,:platform:
-whatsnew/changelog,,:password,: Unquote before b64encoding user:password during Basic
-whatsnew/changelog,,:close,Connection:close header.
 whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused"
-whatsnew/changelog,,:close,: Connection:close header is sent by requests using URLOpener
 whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""."
-whatsnew/changelog,,:test,: test_subprocess:test_leaking_fds_on_error no longer gives a
+whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
+whatsnew/changelog,,:password,user:password
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index a670f94..94a66ac 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -184,7 +184,7 @@ directory. This is an error unless the replacement is intended.  See section
 -----------------------
 
 To speed up loading modules, Python caches the compiled version of each module
-in the ``__pycache__`` directory under the name :file:`module.{version}.pyc``,
+in the ``__pycache__`` directory under the name :file:`module.{version}.pyc`,
 where the version encodes the format of the compiled file; it generally contains
 the Python version number.  For example, in CPython release 3.3 the compiled
 version of spam.py would be cached as ``__pycache__/spam.cpython-33.pyc``.  This
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index b0d49e2..cb7c393 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -412,6 +412,8 @@ class ImportSideEffectTests(unittest.TestCase):
                 self.fail("sitecustomize not imported automatically")
 
     @test.support.requires_resource('network')
+    @unittest.skipUnless(sys.version_info[3] == 'final',
+                         'only for released versions')
     def test_license_exists_at_url(self):
         # This test is a bit fragile since it depends on the format of the
         # string displayed by license in the absence of a LICENSE file.