Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fea7e73

Browse files
serhiy-storchakaserhiy-storchaka
committed
Merge heads
2 parents 6a45021 + 3f99504 commit fea7e73

15 files changed

Lines changed: 41 additions & 25 deletions

File tree

‎.hgtags‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,4 @@ e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4
127127
3405dc9a6afaa0a06dd1f6f182ec5c998dce6f5f v3.4.0b1
128128
ba32913eb13ec545a46dd0ce18035b6c416f0d78 v3.4.0b2
129129
a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3
130+
5e088cea8660677969113741c1313d570d977e02 v3.4.0rc1

‎Doc/library/asyncio-eventloop.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ An event loop policy must implement the following interface:
7777

7878
Create and return a new event loop object according to this policy's rules.
7979
If there's need to set this loop as the event loop of the current context,
80-
:meth`set_event_loop` must be called explicitly.
80+
:meth:`set_event_loop` must be called explicitly.
8181

8282
Access to the global loop policy
8383
--------------------------------

‎Doc/library/enum.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ one decorator, :func:`unique`.
3030
.. class:: Enum
3131

3232
Base class for creating enumerated constants. See section
33-
:ref:`Functional API` for an alternate construction syntax.
33+
`Functional API`_ for an alternate construction syntax.
3434

3535
.. class:: IntEnum
3636

@@ -421,7 +421,7 @@ The solution is to specify the module name explicitly as follows::
421421
>>> Animals = Enum('Animals', 'ant bee cat dog', module=__name__)
422422

423423
The new pickle protocol 4 also, in some circumstances, relies on
424-
:attr:``__qualname__`` being set to the location where pickle will be able
424+
:attr:`__qualname__` being set to the location where pickle will be able
425425
to find the class. For example, if the class was made available in class
426426
SomeData in the global scope::
427427

‎Doc/library/unittest.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,13 +1917,13 @@ Loading and running tests
19171917

19181918
By default this runner shows :exc:`DeprecationWarning`,
19191919
:exc:`PendingDeprecationWarning`, :exc:`ResourceWarning` and
1920-
:exc:`ImportWarning` even if they are :ref:`ignored by default <warning-
1921-
ignored>`. Deprecation warnings caused by :ref:`deprecated unittest methods
1922-
<deprecated-aliases>` are also special-cased and, when the warning filters
1923-
are ``'default'`` or ``'always'``, they will appear only once per-module, in
1924-
order to avoid too many warning messages. This behavior can be overridden
1925-
using the :option:`-Wd` or :option:`-Wa` options and leaving *warnings* to
1926-
``None``.
1920+
:exc:`ImportWarning` even if they are :ref:`ignored by default
1921+
<warning-ignored>`. Deprecation warnings caused by :ref:`deprecated unittest
1922+
methods <deprecated-aliases>` are also special-cased and, when the warning
1923+
filters are ``'default'`` or ``'always'``, they will appear only once
1924+
per-module, in order to avoid too many warning messages. This behavior can
1925+
be overridden using the :option:`-Wd` or :option:`-Wa` options and leaving
1926+
*warnings* to ``None``.
19271927

19281928
.. versionchanged:: 3.2
19291929
Added the ``warnings`` argument.

‎Doc/whatsnew/3.4.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ Changes in the Python API
17291729
Changes in the C API
17301730
--------------------
17311731

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

‎Include/patchlevel.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#define PY_MAJOR_VERSION 3
2020
#define PY_MINOR_VERSION 4
2121
#define PY_MICRO_VERSION 0
22-
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_BETA
23-
#define PY_RELEASE_SERIAL 3
22+
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
23+
#define PY_RELEASE_SERIAL 1
2424

2525
/* Version as a string */
26-
#define PY_VERSION "3.4.0b3+"
26+
#define PY_VERSION "3.4.0rc1+"
2727
/*--end constants--*/
2828

2929
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

‎Lib/asyncio/test_utils.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ def gen():
191191
self._gen = gen()
192192
next(self._gen)
193193
self._time = 0
194+
self._clock_resolution = 1e-9
194195
self._timers = []
195196
self._selector = TestSelector()
196197

‎Lib/distutils/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# Updated automatically by the Python release process.
1414
#
1515
#--start constants--
16-
__version__ = "3.4.0b3"
16+
__version__ = "3.4.0rc1"
1717
#--end constants--

‎Lib/idlelib/idlever.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
IDLE_VERSION = "3.4.0b3"
1+
IDLE_VERSION = "3.4.0rc1"

‎Lib/pydoc_data/topics.py‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)