É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
Ezio Melotti
b429c57481
#12093 : fix typo in struct doc. Patch by Sandro Tosi.
2011-05-17 05:17:35 +03:00
Senthil Kumaran
4dd89ce6bf
Fix closes issue #12088 - fixes the tarfile.extractall issue when the
...
symlinks/hardlink was broken. It handles now in a graceful manner (No exception
is raised, behavior similar GNU tar).
2011-05-17 10:12:18 +08:00
Victor Stinner
72bb99d343
Issue #11614 : Fix test_linecache, cjkencodings_test.py doesn't exist anymore
2011-05-17 01:18:33 +02:00
Victor Stinner
73e3e76be5
Issue #12057 : Convert CJK encoding testcase BLOB into multiple text files
2011-05-16 17:16:18 +02:00
Ronald Oussoren
53b6a5f79c
NEWS entry for fix of issue #9516
2011-05-15 16:51:10 +02:00
Ronald Oussoren
a70286b71d
Issue #9516 : avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set in shell.
...
Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils.
2011-05-15 16:44:27 +02:00
Georg Brandl
11041f0af9
Port #6498 fix: fix several misspellings of "SystemExit" as "SystemError".
2011-05-15 08:50:32 +02:00
Gregory P. Smith
fb1d60c800
Fixes Issue #12059 : Properly handle missing hash functions even when
...
the expected builtin modules are not present.
This includes a unittest for __get_builtin_constructor() in the face
of such an error.
2011-05-14 15:07:53 -07:00
Nadeem Vawda
0cc4fd9df7
Issue #12050 : zlib.decompressobj().decompress() now clears the unconsumed_tail
...
attribute when called without a max_length argument.
2011-05-14 14:29:07 +02:00
Ezio Melotti
9b323a521c
#11979 : improve wording and markup in sockets howto. Patch by Xavier Morel.
2011-05-14 09:17:52 +03:00
Ezio Melotti
4dcb7be696
#7960 : fix docstrings for captured_output and captured_stdout.
2011-05-14 08:19:43 +03:00
Ezio Melotti
e3992eb743
#5723 : Improve json tests to be executed with and without accelerations.
2011-05-14 06:24:53 +03:00
Ezio Melotti
720f8dea19
Change import_fresh_module to work with packages.
2011-05-14 06:02:25 +03:00
Kurt B. Kaiser
d82a8876f0
Issue #11896 : Save on Close failed despite selecting "Yes" in dialog.
...
Backport 70055:35ed0efd7dd3
2011-05-12 21:18:47 -04:00
Antoine Pitrou
ee46a7bf9c
Issue #12062 : In the `io` module, fix a flushing bug when doing a certain
...
type of I/O sequence on a file opened in read+write mode (namely: reading,
seeking a bit forward, writing, then seeking before the previous write but
still within buffered data, and writing again).
2011-05-13 00:31:52 +02:00
Georg Brandl
073070629b
#12061 : remove duplicate glossary entry.
2011-05-12 07:47:06 +02:00
Ezio Melotti
c1ec7b5d44
#12051 : Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations.
2011-05-11 00:55:35 +03:00
Antoine Pitrou
47d1d0dc30
Issue #8498 : In socket.accept(), allow to specify 0 as a backlog value in
...
order to accept exactly one connection. Patch by Daniel Evers.
2011-05-10 19:16:03 +02:00