traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

This commit is contained in:
Larry Hastings 2015-12-06 22:00:57 -08:00
parent 7ff276fd2e 0c6ffabc5b
commit d785da8fbb
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -158,3 +158,4 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
2d033fedfa7f1e325fd14ccdaa9cb42155da206f v3.5.0rc4 2d033fedfa7f1e325fd14ccdaa9cb42155da206f v3.5.0rc4
374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0 374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0
948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1 948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1
37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1

6
Include/patchlevel.h
View File

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

2
Lib/pydoc_data/topics.py
View File

File diff suppressed because one or more lines are too long

7
Misc/NEWS
View File

@ -5,7 +5,7 @@ Python News
What's New in Python 3.5.2 release candidate 1? What's New in Python 3.5.2 release candidate 1?
=============================================== ===============================================
Release date: XXXX-XX-XX Release date: tba
Core and Builtins Core and Builtins
----------------- -----------------
@ -91,8 +91,8 @@ Release date: 2015-12-06
Core and Builtins Core and Builtins
----------------- -----------------
Library - Issue #25709: Fixed problem with in-place string concatenation and
------- utf-8 cache.
Windows Windows
------- -------
@ -100,6 +100,7 @@ Windows
- Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect - Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect
logic for launcher detection. logic for launcher detection.
What's New in Python 3.5.1 release candidate 1? What's New in Python 3.5.1 release candidate 1?
=============================================== ===============================================