Martin v. Löwis
609e36d887
Nearly null-merge 2.5.6
2011-05-28 14:14:17 +02:00
Martin v. Löwis
9c53584ebd
Nearly null-merge 2.5.6
2011-05-28 14:13:32 +02:00
Martin v. Löwis
228516c3f8
merge 2.5.6c1 tag
2011-05-28 14:06:55 +02:00
Martin v. Löwis
dcdf0320c0
Added tag v2.5.6c1 for changeset a87c7b96672b
2011-05-28 14:05:31 +02:00
Martin v. Löwis
4ca9d48a04
Added tag v2.5.6 for changeset de34c7b097e8
2011-05-28 14:00:37 +02:00
Martin v. Löwis
11a859d70d
r88840: Prepare for 2.5.6.
2011-05-28 13:58:36 +02:00
Martin v. Löwis
e81c485e57
r88828: Fix year.
2011-05-28 13:57:28 +02:00
Martin v. Löwis
cf60858b55
r88824: Prepare for 2.5.6c1.
2011-05-28 13:56:22 +02:00
Ned Deily
482f908410
Issue #9670 : Increase the default stack size for secondary threads on
...
Mac OS X and FreeBSD to reduce the chances of a crash instead of a
"maximum recursion depth" RuntimeError exception.
(patch by Ronald Oussoren)
2011-05-28 00:11:54 -07:00
Benjamin Peterson
1e94021ea5
merge heads
2011-05-26 09:57:21 -05:00
Benjamin Peterson
4fa68ab10b
raise an ValueError in getvalue() on closed StringIO ( closes #12161 )
...
Thanks for Catalin Iacob for the patch.
2011-05-26 09:56:41 -05:00
Éric Araujo
8fcda6829a
Branch merge
2011-05-26 16:52:22 +02:00
Victor Stinner
dbfba1667c
Close #12182 : Fix pydoc.HTMLDoc.multicolumn() if Python uses the new (true)
...
division (python -Qnew). Patch written by Ralf W. Grosse-Kunstleve.
2011-05-26 13:37:25 +02:00
Kurt B. Kaiser
a5392455f6
IDLE: #6378 : Further adjust idle.bat to start associated Python
2011-05-25 22:36:51 -04:00
Victor Stinner
daf17e9bc8
Issue #12175 : RawIOBase.readall() now returns None if read() returns None.
2011-05-25 22:52:37 +02:00
Victor Stinner
5100a405dc
Issue #12175 : FileIO.readall() now raises a ValueError instead of an IOError if
...
the file is closed.
2011-05-25 22:15:36 +02:00
Éric Araujo
31890bc9ba
Fix display of html.parser.HTMLParser.feed docstrin
2011-05-25 18:11:43 +02:00
Éric Araujo
ea088c5163
Add missing name in pkgutil.__all__
2011-05-25 18:11:24 +02:00
Éric Araujo
78d9133989
Branch merge
2011-05-25 18:06:35 +02:00
Éric Araujo
18176f06b5
Fix two typos
2011-05-25 18:06:16 +02:00
Victor Stinner
e2d9e26a10
Issue #12057 : Add cjkencodings directory to the Makefile and Tools/msi/msi.py
2011-05-25 01:19:57 +02:00
Victor Stinner
9e5cdcc243
Issue #12057 : Add tests for the HZ encoding
2011-05-25 00:19:07 +02:00
Charles-François Natali
b94e0cde60
Issue #1441530 : In imaplib, use makefile() to wrap the SSL socket to avoid
...
heap fragmentation and MemoryError with some malloc implementations.
2011-05-24 23:10:54 +02:00
Victor Stinner
40b41e1ffd
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:29:13 +02:00
Benjamin Peterson
80a09c70bf
use '->' to indicate return values
2011-05-24 12:42:51 -05:00
Benjamin Peterson
7f5cd45f1d
must clear an AttributeError if it is set
2011-05-23 18:17:55 -05:00
Benjamin Peterson
fd89af59e8
handle old-style instances
2011-05-23 17:11:21 -05:00
Benjamin Peterson
8de87a6403
correctly lookup __dir__
2011-05-23 16:11:05 -05:00
Barry Warsaw
4ef33dc381
Null merge from 2.6 branch.
2011-05-23 15:29:24 -04:00
Barry Warsaw
32140f8955
Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit
...
message:
Merging post 2.6.7rc2 changes from Subversion.
2011-05-23 15:27:52 -04:00
Barry Warsaw
34289260da
Replay changeset 70248:c714e2f92f63 from fubar branch. Original commit
...
message:
Cross-port changes for 2.6.7rc2 from the Subversion branch.
2011-05-23 15:26:11 -04:00
Barry Warsaw
cf0d8ab818
Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
...
message:
Reconcile with the 2.6svn branch. The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync. These
changes should *not* propagate to any newer versions.
2011-05-23 15:22:56 -04:00
Victor Stinner
6c603c4593
test_codecs now removes the temporay file (created by the test)
2011-05-23 16:19:31 +02:00
Eli Bendersky
29f6efa844
Issue 12003: fixing error in xrange alternative sample
2011-05-23 06:10:26 +03:00
Barry Warsaw
0406d966a1
Forward merge.
2011-05-22 21:17:49 -04:00
Barry Warsaw
e26bc109ff
These files have Windows line endings in 2.6.
2011-05-22 21:16:55 -04:00
Victor Stinner
2e7f39e889
Issue #12012 : test_ssl uses test_support.import_module()
...
Skip the whole file if the SSL module is missing. It was already the case,
except that the SkipTest exception was raised in test_main().
This commit fixes an error in test_ssl if the ssl module is missing.
2011-05-22 13:22:28 +02:00
Eli Bendersky
e91b305d28
Issue 12126: removing incorrect claim about return value of select
2011-05-22 06:49:01 +03:00
Raymond Hettinger
691a659ddb
Simplify example
2011-05-21 09:39:57 -07:00
Victor Stinner
f58f1c33c1
Issue #12124 : zipimport doesn't keep a reference to zlib.decompress() anymore
...
to be able to unload the module.
2011-05-21 02:13:22 +02:00
Benjamin Peterson
ce77defd84
this should actually be an IOError
2011-05-20 11:49:06 -05:00
Benjamin Peterson
30e10d8114
add example for not using access
2011-05-20 11:41:13 -05:00
Ezio Melotti
52f63eabeb
#12072 : add missing parenthesis in the doc. Patch by Sandro Tosi.
2011-05-20 15:04:38 +03:00
Raymond Hettinger
22d8f7b9b8
Minor code cleanup.
2011-05-18 17:28:50 -05:00
Benjamin Peterson
d021f72abf
merge heads
2011-05-17 18:32:26 -05:00
Benjamin Peterson
6116d4a1d1
stop using the old brain-dead interface for providing attributes/methods
...
This closes #12099 .
2011-05-17 18:31:20 -05:00
Victor Stinner
2c5e28ebc2
Issue #12057 : Fix .hgeol and test_multibytecodec_support for the conversion of
...
the CJK encoding testcase BLOB into multiple text files.
2011-05-17 15:49:56 +02:00
Ronald Oussoren
b13cacf677
(backport) 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 = raw_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 15:13:46 +02:00
Ronald Oussoren
372954e059
(backport)Fix #10154 and #10090 : locale normalizes the UTF-8 encoding to "UTF-8" instead of "UTF8"
...
On MacOSX and OpenBSD (and possibly other BSDs) "en_US.UTF-8" is a valid locale
while "en_US.UTF8" is not. As the former works on Linux as well it is better
to normalize to that value.
2011-05-17 13:22:30 +02:00
Ezio Melotti
bfbd1a2fd4
#12092 : backport rephrasing of a paragraph in the tutorial.
2011-05-17 05:39:22 +03:00