Merge.
This commit is contained in:
commit
f9c88ec3c7
1
.hgtags
1
.hgtags
|
@ -144,3 +144,4 @@ c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
|
|||
ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
|
||||
69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1
|
||||
b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
|
||||
04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
/*--start constants--*/
|
||||
#define PY_MAJOR_VERSION 3
|
||||
#define PY_MINOR_VERSION 4
|
||||
#define PY_MICRO_VERSION 3
|
||||
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
|
||||
#define PY_RELEASE_SERIAL 0
|
||||
#define PY_MICRO_VERSION 4
|
||||
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
|
||||
#define PY_RELEASE_SERIAL 1
|
||||
|
||||
/* Version as a string */
|
||||
#define PY_VERSION "3.4.3+"
|
||||
#define PY_VERSION "3.4.4rc1+"
|
||||
/*--end constants--*/
|
||||
|
||||
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
|
||||
|
|
File diff suppressed because one or more lines are too long
21
Misc/NEWS
21
Misc/NEWS
|
@ -2,15 +2,28 @@
|
|||
Python News
|
||||
+++++++++++
|
||||
|
||||
What's New in Python 3.4.4rc1?
|
||||
==============================
|
||||
What's New in Python 3.4.4?
|
||||
===========================
|
||||
|
||||
Release date: tba
|
||||
Release date: 2015/12/20
|
||||
|
||||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
|
||||
Library
|
||||
-------
|
||||
|
||||
|
||||
What's New in Python 3.4.4rc1?
|
||||
==============================
|
||||
|
||||
Release date: 2015/12/06
|
||||
|
||||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #25709: Fixed problem with in-place string concatenation and utf-8
|
||||
cache.
|
||||
|
||||
- Issue #24097: Fixed crash in object.__reduce__() if slot name is freed inside
|
||||
__getattr__.
|
||||
|
|
Loading…
Reference in New Issue