Merge heads

.hgtags

@@ -127,3 +127,4 @@ e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4
 3405dc9a6afaa0a06dd1f6f182ec5c998dce6f5f v3.4.0b1
 ba32913eb13ec545a46dd0ce18035b6c416f0d78 v3.4.0b2
 a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3
+5e088cea8660677969113741c1313d570d977e02 v3.4.0rc1

Doc/library/asyncio-eventloop.rst

@@ -77,7 +77,7 @@ An event loop policy must implement the following interface:
 
    Create and return a new event loop object according to this policy's rules.
    If there's need to set this loop as the event loop of the current context,
-   :meth`set_event_loop` must be called explicitly.
+   :meth:`set_event_loop` must be called explicitly.
 
 Access to the global loop policy
 --------------------------------

Doc/library/enum.rst

@@ -30,7 +30,7 @@ one decorator, :func:`unique`.
 .. class:: Enum
 
     Base class for creating enumerated constants.  See section
-    :ref:`Functional API` for an alternate construction syntax.
+    `Functional API`_ for an alternate construction syntax.
 
 .. class:: IntEnum
 
@@ -421,7 +421,7 @@ The solution is to specify the module name explicitly as follows::
     >>> Animals = Enum('Animals', 'ant bee cat dog', module=__name__)
 
 The new pickle protocol 4 also, in some circumstances, relies on
-:attr:``__qualname__`` being set to the location where pickle will be able
+:attr:`__qualname__` being set to the location where pickle will be able
 to find the class.  For example, if the class was made available in class
 SomeData in the global scope::
 

Doc/library/unittest.rst

@@ -1917,13 +1917,13 @@ Loading and running tests
 
    By default this runner shows :exc:`DeprecationWarning`,
    :exc:`PendingDeprecationWarning`, :exc:`ResourceWarning` and
-   :exc:`ImportWarning` even if they are :ref:`ignored by default <warning-
-   ignored>`. Deprecation warnings caused by :ref:`deprecated unittest methods
-   <deprecated-aliases>` are also special-cased and, when the warning filters
-   are ``'default'`` or ``'always'``, they will appear only once per-module, in
-   order to avoid too many warning messages.  This behavior can be overridden
-   using the :option:`-Wd` or :option:`-Wa` options and leaving *warnings* to
-   ``None``.
+   :exc:`ImportWarning` even if they are :ref:`ignored by default
+   <warning-ignored>`. Deprecation warnings caused by :ref:`deprecated unittest
+   methods <deprecated-aliases>` are also special-cased and, when the warning
+   filters are ``'default'`` or ``'always'``, they will appear only once
+   per-module, in order to avoid too many warning messages.  This behavior can
+   be overridden using the :option:`-Wd` or :option:`-Wa` options and leaving
+   *warnings* to ``None``.
 
    .. versionchanged:: 3.2
       Added the ``warnings`` argument.

Doc/whatsnew/3.4.rst

@@ -1729,7 +1729,7 @@ Changes in the Python API
 Changes in the C API
 --------------------
 
-* :c:func:`PyEval_EvalFrameEx`, :c:func:`PyObject_Repr(), and
+* :c:func:`PyEval_EvalFrameEx`, :c:func:`PyObject_Repr`, and
   :c:func:`PyObject_Str`, along with some other internal C APIs, now include
   a debugging assertion that ensures they are not used in situations where
   they may silently discard a currently active exception. In cases where

Include/patchlevel.h

@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	4
 #define PY_MICRO_VERSION	0
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_BETA
-#define PY_RELEASE_SERIAL	3
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION      	"3.4.0b3+"
+#define PY_VERSION      	"3.4.0rc1+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/asyncio/test_utils.py

@@ -191,6 +191,7 @@ class TestLoop(base_events.BaseEventLoop):
         self._gen = gen()
         next(self._gen)
         self._time = 0
+        self._clock_resolution = 1e-9
         self._timers = []
         self._selector = TestSelector()
 

Lib/distutils/__init__.py

@@ -13,5 +13,5 @@ used from a setup script as
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0b3"
+__version__ = "3.4.0rc1"
 #--end constants--

Lib/idlelib/idlever.py

-IDLE_VERSION = "3.4.0b3"
+IDLE_VERSION = "3.4.0rc1"

Misc/NEWS

@@ -2,10 +2,25 @@
 Python News
 +++++++++++
 
+What's New in Python 3.4.0 release candidate 2?
+===============================================
+
+Release date: 2014-02-23
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+- Issue #19856: shutil.move() failed to move a directory to other directory
+  on Windows if source name ends with os.altsep.
+
+
 What's New in Python 3.4.0 release candidate 1?
 ===============================================
 
-Release date: 2014-02-09
+Release date: 2014-02-10
 
 Core and Builtins
 -----------------
@@ -37,9 +52,6 @@ Core and Builtins
 Library
 -------
 
-- Issue #19856: shutil.move() failed to move a directory to other directory
-  on Windows if source name ends with os.altsep.
-
 - Issue #20530: The signatures for slot builtins have been updated
   to reflect the fact that they only accept positional-only arguments.
 

Misc/RPM/python-3.4.spec

@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.4.0b3
+%define version 3.4.0rc1
 %define libvers 3.4
 #--end constants--
 %define release 1pydotorg

PC/python3.def

@@ -519,6 +519,7 @@ EXPORTS
   PyType_GenericAlloc=python34.PyType_GenericAlloc
   PyType_GenericNew=python34.PyType_GenericNew
   PyType_GetFlags=python34.PyType_GetFlags
+  PyType_GetSlot=python34.PyType_GetSlot
   PyType_IsSubtype=python34.PyType_IsSubtype
   PyType_Modified=python34.PyType_Modified
   PyType_Ready=python34.PyType_Ready

PC/python34stub.def

@@ -518,6 +518,7 @@ PyType_FromSpecWithBases
 PyType_GenericAlloc
 PyType_GenericNew
 PyType_GetFlags
+PyType_GetSlot
 PyType_IsSubtype
 PyType_Modified
 PyType_Ready

README

-This is Python version 3.4.0 beta 3
-===================================
+This is Python version 3.4.0 release candidate 1
+================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012, 2013, 2014 Python Software Foundation.  All rights reserved.