Éric Araujo
51b7aedadd
Merge 3.1
2011-05-25 18:13:49 +02:00
Éric Araujo
d4701f4262
Fix two typos
2011-05-25 18:13:29 +02:00
Éric Araujo
29ef0064de
Branch merge
2011-05-25 18:12:22 +02:00
Victor Stinner
5b3265906f
(Merge 3.1) Issue #12057 : Add cjkencodings directory to the Makefile and
...
Tools/msi/msi.py
2011-05-25 01:15:59 +02:00
Victor Stinner
46f8264b8e
Issue #12057 : Add cjkencodings directory to the Makefile and Tools/msi/msi.py
2011-05-25 01:13:59 +02:00
Victor Stinner
8ed8416c2b
(Merge 3.1) Issue #12057 : Add tests for the HZ encoding
2011-05-25 00:16:43 +02:00
Victor Stinner
8fdfc20fc4
Issue #12057 : Add tests for the HZ encoding
2011-05-25 00:06:51 +02:00
Victor Stinner
1273b7cd9c
Issue #12070 : Fix the Makefile parser of the sysconfig module to handle
...
correctly references to "bogus variable" (e.g. "prefix=$/opt/python").
2011-05-24 23:37:07 +02:00
Victor Stinner
d48ba0bde5
(Merge 3.1) Issue #12100 : Don't reset incremental encoders of CJK codecs at
...
each call to their encode() method anymore, but continue to call the reset()
method if the final argument is True.
2011-05-24 22:22:17 +02:00
Victor Stinner
6bcbef7da0
Issue #12100 : Don't reset incremental encoders of CJK codecs at each call to
...
their encode() method anymore, but continue to call the reset() method if the
final argument is True.
2011-05-24 22:17:55 +02:00
Benjamin Peterson
e6a06217d2
merge 3.1
2011-05-24 12:51:24 -05:00
Benjamin Peterson
f847393308
backout 8b384de4e780, so a proper fix can be considered ( #5715 )
2011-05-24 12:50:34 -05:00
Benjamin Peterson
17658a1ca0
merge 3.1
2011-05-24 12:44:26 -05:00
Benjamin Peterson
fbe56bb8bd
use '->' to indicate return values
2011-05-24 12:42:51 -05:00
Benjamin Peterson
48e21fc46f
merge 3.1
2011-05-24 12:09:26 -05:00
Benjamin Peterson
a7cdb0f218
generally, sockets should be closed after they're used
2011-05-24 12:06:31 -05:00
Charles-François Natali
cf057597e6
Issue #5715 : In socketserver, close the server socket in the child process.
2011-05-24 18:27:25 +02:00
Charles-François Natali
7b54e7562d
Issue #5715 : In socketserver, close the server socket in the child process.
2011-05-24 18:23:15 +02:00
Ezio Melotti
84f75c680c
#12074 : remove the /0 when there are no failures.
2011-05-24 01:00:10 +03:00
Benjamin Peterson
200fe3d747
merge heads
2011-05-23 16:29:50 -05:00
Benjamin Peterson
f5fcd33be9
merge 3.1
2011-05-23 16:22:42 -05:00
Victor Stinner
a2a895c46c
Issue #12074 : regrtest displays also the current number of failures
2011-05-23 23:14:05 +02:00
Benjamin Peterson
7963a35b41
correctly lookup __dir__
2011-05-23 16:11:05 -05:00
Raymond Hettinger
4b244ef255
Clean-up example.
2011-05-23 12:45:34 -07:00
Victor Stinner
b43dd4b8ca
Merge 3.1
2011-05-23 14:57:05 +02:00
Victor Stinner
2cca057284
test_codecs now removes the temporay file (created by the test)
2011-05-23 14:51:42 +02:00
Martin v. Löwis
ad234203dd
Add 3.2.1rc2 uuid.
2011-05-23 07:02:07 +02:00
Victor Stinner
3c8d12d6b8
Issue #10801 : Remove a debug print() from test_zipfile
2011-05-22 22:12:27 +02:00
Antoine Pitrou
a98d26a500
Issue #12138 : fix use of transient_internet() in test_urllibnet
2011-05-22 17:35:17 +02:00
Martin v. Loewis
b042a3ac0c
Add 3.2.1rc2 uuid.
2011-05-22 12:59:35 +02:00
Eli Bendersky
2f1b3962a2
Issue 12126: removing incorrect claim about return value of select
...
merge 3.1 -> 3.2
2011-05-22 06:57:17 +03:00
Eli Bendersky
46ab96a0c8
Issue 12126: removing incorrect claim about return value of select
2011-05-22 06:56:15 +03:00
Raymond Hettinger
f9ca76f500
Simplify example
2011-05-21 09:33:45 -07:00
Georg Brandl
d079367044
Set up branch to be rc2 next.
2011-05-21 17:36:20 +02:00
Georg Brandl
9c1928f0a9
Merge release branch after 3.2.1rc1.
2011-05-21 17:35:33 +02:00
Benjamin Peterson
619323c68f
merge 3.1
2011-05-20 11:49:19 -05:00
Benjamin Peterson
2340986fe0
this should actually be an IOError
2011-05-20 11:49:06 -05:00
Benjamin Peterson
c7dd737ef7
merge 3.1
2011-05-20 11:41:59 -05:00
Benjamin Peterson
249b508c98
add example for not using access
2011-05-20 11:41:13 -05:00
Ezio Melotti
da5b852c7c
#12072 : merge with 3.1.
2011-05-20 15:06:32 +03:00
Ezio Melotti
261d855fd6
#12072 : add missing parenthesis in the doc. Patch by Sandro Tosi.
2011-05-20 15:04:38 +03:00
Victor Stinner
62a68f2dbe
test_pydoc: skip PydocServerTest if thread support is disabled
2011-05-20 02:29:13 +02:00
Victor Stinner
4445ec81c1
(Merge 3.1) Issue #12124 : zipimport doesn't keep a reference to
...
zlib.decompress() anymore to be able to unload the module.
2011-05-20 00:18:58 +02:00
Victor Stinner
4925cde1cc
Issue #12124 : zipimport doesn't keep a reference to zlib.decompress() anymore
...
to be able to unload the module.
2011-05-20 00:16:09 +02:00
Antoine Pitrou
f23f786c61
Fix section title
2011-05-18 18:58:09 +02:00
Antoine Pitrou
b4410dbea6
Issue #12065 : connect_ex() on an SSL socket now returns the original errno
...
when the socket's timeout expires (it used to return None).
2011-05-18 18:51:06 +02:00
Victor Stinner
ae8856fe36
Ooops, add the missing file of the backport of commit 33543b4e0e5d from Python
...
3.2 (#10801 : In zipfile, support different encodings for the header and the
filenames. Patch by MvL, test by Eli Bendersky.)
2011-05-18 13:48:41 +02:00
Victor Stinner
ff1d2f4cc5
Backport commit 33543b4e0e5d from Python 3.2: #10801 : In zipfile, support
...
different encodings for the header and the filenames. Patch by MvL, test by
Eli Bendersky.
2011-05-18 13:43:23 +02:00
Victor Stinner
3349bca46d
Issue #12096 : Fix a race condition in test_threading.test_waitfor(). Patch
...
written by Charles-François Natali.
2011-05-18 00:16:14 +02:00
Ronald Oussoren
5ee0567bb2
Fixes #11088 : IDLE crashes when using F5 to run a script on OSX with Tk 8.5
...
Without this patch IDLE will crash reliably on OSX when Tkinter
is linked to TkCocoa 8.5.x.
To reproduce:
* Create a new file (script.py) with the following two lines:
x = input('prompt: ')
print(x)
* Save the script
* Run the script using the F5 keyboard shortcut
(running from the menu works fine)
The patch is a fairly crude hack, but we haven't found a better
workaround for this Tk bug yet.
2011-05-17 14:48:40 +02:00