Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.3.5rc1 release commits with 3.3 branch

This commit is contained in:
Georg Brandl 2014-03-02 08:54:15 +01:00
parent 9e90b12bb2 b772b03194
commit 2658bad090
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -120,3 +120,4 @@ d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3 c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1 fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
7ff62415e4263c432c8acf6e424224209211eadb v3.3.4 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1

8
Include/patchlevel.h
View File

@ -18,12 +18,12 @@
/*--start constants--*/ /*--start constants--*/
#define PY_MAJOR_VERSION 3 #define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 3 #define PY_MINOR_VERSION 3
#define PY_MICRO_VERSION 4 #define PY_MICRO_VERSION 5
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
#define PY_RELEASE_SERIAL 0 #define PY_RELEASE_SERIAL 1
/* Version as a string */ /* Version as a string */
#define PY_VERSION "3.3.4+" #define PY_VERSION "3.3.5rc1"
/*--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/distutils/__init__.py
View File

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

2
Lib/idlelib/idlever.py
View File

@ -1 +1 @@
IDLE_VERSION = "3.3.4" IDLE_VERSION = "3.3.5rc1"

1
Lib/test/test_robotparser.py
View File

@ -275,6 +275,7 @@ class NetworkTestCase(unittest.TestCase):
self.skipTest('%s is unavailable' % url) self.skipTest('%s is unavailable' % url)
self.assertEqual(parser.can_fetch("*", robots_url), False) self.assertEqual(parser.can_fetch("*", robots_url), False)
@unittest.skip('does not handle the gzip encoding delivered by pydotorg')
def testPythonOrg(self): def testPythonOrg(self):
support.requires('network') support.requires('network')
with support.transient_internet('www.python.org'): with support.transient_internet('www.python.org'):

2
Misc/NEWS
View File

@ -5,7 +5,7 @@ Python News
What's New in Python 3.3.5 release candidate 1? What's New in Python 3.3.5 release candidate 1?
=============================================== ===============================================
*Release date: XXXX-XX-XX* *Release date: 23-Feb-2014*
Core and Builtins Core and Builtins
----------------- -----------------

2
Misc/RPM/python-3.3.spec
View File

@ -39,7 +39,7 @@
%define name python %define name python
#--start constants-- #--start constants--
%define version 3.3.4 %define version 3.3.5rc1
%define libvers 3.3 %define libvers 3.3
#--end constants-- #--end constants--
%define release 1pydotorg %define release 1pydotorg

4
README
View File

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