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

Skip to content

Commit cca5548

Browse files
committed
merge with 3.3.1 release clone
2 parents 2fd4abe + 485acde commit cca5548

10 files changed

Lines changed: 53 additions & 33 deletions

File tree

.hgtags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,5 @@ e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
111111
88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
112112
c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
113113
bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
114+
92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
115+
d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1

Doc/library/concurrent.futures.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ ThreadPoolExecutor Example
144144
# We can use a with statement to ensure threads are cleaned up promptly
145145
with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
146146
# Start the load operations and mark each future with its URL
147-
future_to_url = {executor.submit(load_url, url, 60):url for url in URLS}
147+
future_to_url = {executor.submit(load_url, url, 60): url for url in URLS}
148148
for future in concurrent.futures.as_completed(future_to_url):
149149
url = future_to_url[future]
150150
try:

Include/patchlevel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
/*--start constants--*/
1919
#define PY_MAJOR_VERSION 3
2020
#define PY_MINOR_VERSION 3
21-
#define PY_MICRO_VERSION 0
21+
#define PY_MICRO_VERSION 1
2222
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
2323
#define PY_RELEASE_SERIAL 0
2424

2525
/* Version as a string */
26-
#define PY_VERSION "3.3.0+"
26+
#define PY_VERSION "3.3.1"
2727
/*--end constants--*/
2828

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

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.3.0"
16+
__version__ = "3.3.1"
1717
#--end constants--

Lib/idlelib/NEWS.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ What's New in IDLE 3.3.2?
88
What's New in IDLE 3.3.1?
99
=========================
1010

11+
- Issue #17625: Close the replace dialog after it is used.
12+
1113
- Issue #16226: Fix IDLE Path Browser crash.
1214
(Patch by Roger Serwy)
1315

Lib/idlelib/idlever.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
IDLE_VERSION = "3.3.0"
1+
IDLE_VERSION = "3.3.1"

Lib/pydoc_data/topics.py

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

Misc/NEWS

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Python News
55
What's New in Python 3.3.2?
66
===========================
77

8-
*Release date: XXXX-XX-XX*
8+
.. *Release date: XXXX-XX-XX*
99

10-
*Not yet released, see sections below for changes released in 3.3.0*
10+
*Not yet released, see sections below for changes released in 3.3.1*
1111

1212
Core and Builtins
1313
-----------------
@@ -54,6 +54,22 @@ What's New in Python 3.3.1?
5454

5555
*Release date: 07-Apr-2013*
5656

57+
Build
58+
-----
59+
60+
- Issue #17550: Fix the --enable-profiling configure switch.
61+
62+
Library
63+
-------
64+
65+
- Issue #17625: In IDLE, close the replace dialog after it is used.
66+
67+
68+
What's New in Python 3.3.1 release candidate 1?
69+
===============================================
70+
71+
*Release date: 24-Mar-2013*
72+
5773
Core and Builtins
5874
-----------------
5975

@@ -1246,7 +1262,7 @@ Documentation
12461262
- Create a 'Concurrent Execution' section in the docs, and split up the
12471263
'Optional Operating System Services' section to use a more user-centric
12481264
classification scheme (splitting them across the new CE section, IPC and text
1249-
processing). Operating system limitatons can be reflected with the Sphinx
1265+
processing). Operating system limitations can be reflected with the Sphinx
12501266
``:platform:`` tag, it doesn't make sense as part of the Table of Contents.
12511267

12521268
- Issue #4966: Bring the sequence docs up to date for the Py3k transition and
@@ -3454,7 +3470,7 @@ Library
34543470
- Issue #13589: Fix some serialization primitives in the aifc module.
34553471
Patch by Oleg Plakhotnyuk.
34563472

3457-
- Issue #13642: Unquote before b64encoding user:password during Basic
3473+
- Issue #13642: Unquote before b64encoding ``user:password`` during Basic
34583474
Authentication. Patch contributed by Joonas Kuorilehto.
34593475

34603476
- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow
@@ -3938,8 +3954,8 @@ Library
39383954
- Issue #12590: IDLE editor window now always displays the first line
39393955
when opening a long file. With Tk 8.5, the first line was hidden.
39403956

3941-
- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates)
3942-
Connection:close header.
3957+
- Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscate)
3958+
a ``Connection: close`` header.
39433959

39443960
- Issue #12102: Document that buffered files must be flushed before being used
39453961
with mmap. Patch by Steffen Daode Nurpmeso.
@@ -4265,7 +4281,7 @@ Library
42654281
Patch by John O'Connor.
42664282

42674283
- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError.
4268-
With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused
4284+
With Tk < 8.5, PythonCmd() in _tkinter.c raised UnicodeDecodeError, caused
42694285
IDLE to exit. Converted to valid Unicode null in PythonCmd().
42704286

42714287
- Issue #11799: urllib.request Authentication Handlers will raise a ValueError
@@ -4544,7 +4560,7 @@ Library
45444560

45454561
- Issue #11127: Raise a TypeError when trying to pickle a socket object.
45464562

4547-
- Issue #11563: Connection:close header is sent by requests using URLOpener
4563+
- Issue #11563: ``Connection: close`` header is sent by requests using URLOpener
45484564
class which helps in closing of sockets after connection is over. Patch
45494565
contributions by Jeff McNeil and Nadeem Vawda.
45504566

@@ -5052,7 +5068,7 @@ Tests
50525068
- Issue #11505: improves test coverage of string.py. Patch by Alicia
50535069
Arlen
50545070

5055-
- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
5071+
- Issue #11490: test_subprocess.test_leaking_fds_on_error no longer gives a
50565072
false positive if the last directory in the path is inaccessible.
50575073

50585074
- Issue #11223: Fix test_threadsignals to fail, not hang, when the

Misc/RPM/python-3.3.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
%define name python
4141
#--start constants--
42-
%define version 3.3.0
42+
%define version 3.3.1
4343
%define libvers 3.3
4444
#--end constants--
4545
%define release 1pydotorg

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is Python version 3.3.0
1+
This is Python version 3.3.1
22
============================
33

44
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,

0 commit comments

Comments
 (0)