Éric Araujo
50dc1a23d8
Branch merge
2011-03-21 03:17:12 +01:00
Victor Stinner
f1a9d82e35
merge 3.2
2011-03-21 02:53:04 +01:00
Victor Stinner
56f9a0221b
merge 3.1
2011-03-21 02:51:38 +01:00
Victor Stinner
628225c0d1
Issue #5537 : Fix time2isoz() and time2netscape() functions of httplib.cookiejar
...
for expiration year greater than 2038 on 32-bit systems.
2011-03-21 02:38:51 +01:00
Victor Stinner
161fbeae72
merge 3.2
2011-03-21 02:15:18 +01:00
Victor Stinner
6f0e4f99ab
time.strftime(): replace PyErr_Format() by PyErr_SetString()
...
The argument was not used in the format string.
2011-03-21 02:14:53 +01:00
Victor Stinner
ee525de6a9
merge
2011-03-21 02:12:09 +01:00
Victor Stinner
13ed2ea7a2
Issue #10864 has been fixed: remove the workaround
2011-03-21 02:11:01 +01:00
Victor Stinner
34ad2faf85
Closes #11210 : Remove PyErr_SetFromWindowsErrWithFilenameObject() of pyerrors.h
...
PyErr_SetFromWindowsErrWithFilenameObject() was never implemented.
2011-03-21 01:58:55 +01:00
Antoine Pitrou
ea9621102e
Merge
2011-03-21 00:29:02 +01:00
Antoine Pitrou
25871dac00
Merge
2011-03-21 00:28:52 +01:00
Antoine Pitrou
03637052ec
Try to strengthen test_httpservers (issue #11617 )
2011-03-21 00:27:45 +01:00
Antoine Pitrou
cb342182ee
Try to strengthen test_httpservers (issue #11617 )
2011-03-21 00:26:51 +01:00
Éric Araujo
eda5583bdc
Mark getopt error messages as localizable ( fixes #11371 ).
...
Patch by Filip Gruszczyński.
2011-03-21 00:09:07 +01:00
Antoine Pitrou
6d58d64919
Issue #11127 : Raise a TypeError when trying to pickle a socket object.
2011-03-20 23:56:36 +01:00
Victor Stinner
b938bcd211
(merge) Issue #11395 : io.FileIO().write() clamps the data length to 32,767
...
bytes on Windows if the file is a TTY to workaround a Windows bug. The Windows
console returns an error (12: not enough space error) on writing into stdout if
stdout mode is binary and the length is greater than 66,000 bytes (or less,
depending on heap usage).
2011-03-20 23:37:55 +01:00
Victor Stinner
e0daff1c61
Issue #11395 : io.FileIO().write() clamps the data length to 32,767 bytes on
...
Windows if the file is a TTY to workaround a Windows bug. The Windows console
returns an error (12: not enough space error) on writing into stdout if
stdout mode is binary and the length is greater than 66,000 bytes (or less,
depending on heap usage).
2011-03-20 23:36:35 +01:00
Victor Stinner
0421810b3b
merge
2011-03-20 23:25:25 +01:00
Victor Stinner
9c4efe571d
Fix #11586 : typo in initfsencoding()
...
Patch written by Ray Allen.
2011-03-20 23:23:22 +01:00
Victor Stinner
4ca2809b5c
Fix #11586 : typo in initfsencoding()
...
Patch written by Ray Allen.
2011-03-20 23:09:03 +01:00
Victor Stinner
6ae1e7f04e
Issue #3080 : imp.load_module() accepts None for the module path
...
imp.find_module() returns None as module path for builtin and frozen builtins.
2011-03-20 22:37:17 +01:00
Éric Araujo
6a1454f3a4
Use proper gettext plural forms in optparse ( closes #4391 ).
...
Original patch by Dwayne Bailey.
2011-03-20 19:59:25 +01:00
Georg Brandl
2592f62a5a
tabs are verboten.
2011-03-20 18:14:07 +00:00
Éric Araujo
7582385887
Merge from 3.1
2011-03-20 18:32:51 +01:00
Éric Araujo
d40248777b
Merge from 3.1
2011-03-20 18:31:42 +01:00
Éric Araujo
09eb980e3e
Fix typo in class name
2011-03-20 18:30:37 +01:00
Éric Araujo
16e6f4c3f0
Fix a typo (see #3080 )
2011-03-20 18:08:19 +01:00
Antoine Pitrou
ec60e31bad
Merge
2011-03-20 17:42:55 +01:00
Antoine Pitrou
7903cb727e
Merge
2011-03-20 17:36:26 +01:00
Antoine Pitrou
8189ab85e3
Call reap_children() where appropriate
2011-03-20 17:35:32 +01:00
Antoine Pitrou
68c9592d33
Call reap_children() at the end of test_posix
2011-03-20 17:33:57 +01:00
Ross Lagerwall
dedf6cf387
Issue #11615 : Fix sporadic buildbot failures related to #10812 .
2011-03-20 18:27:05 +02:00
R David Murray
3c8d0cc5e5
Merge heads.
2011-03-20 11:37:13 -04:00
R David Murray
3d81d3e0d3
Markup fixes for #7198 patch.
...
Also corrected the indentation of one of the examples.
2011-03-20 11:33:17 -04:00
Reid Kleckner
9a67e6c743
Fix the Windows timeout code.
2011-03-20 08:28:07 -07:00
R David Murray
38a04e51f6
Merge markup fixes for #7198 patch.
2011-03-20 11:19:20 -04:00
R David Murray
9c0d5eaa70
Markup fixes for #7198 patch.
2011-03-20 11:18:21 -04:00
R David Murray
a50549b845
Fix footnote reference.
2011-03-20 11:08:10 -04:00
Skip Montanaro
5b5394c6df
mention newline= in write doc
2011-03-20 09:50:43 -05:00
R David Murray
eb887965f7
Dummy merge #7198
...
Changeset ab27f16f707a was messed up by a rebase (as were
959f666470cc and 9d1b1a95bc8f) and the patch only got applied
to default.
2011-03-20 10:27:48 -04:00
R David Murray
fb8b067360
Really merge #7198
...
Changeset ab27f16f707a was messed up by a rebase (as were
959f666470cc and 9d1b1a95bc8f) and the patch only got applied
to default.
2011-03-20 10:25:29 -04:00
R David Murray
f453debb45
#7198 : really add newline='' to csv.writer docs.
...
Changeset ab27f16f707a was messed up by a rebase (as were
959f666470cc and 9d1b1a95bc8f) and the patch only got applied
to default.
2011-03-20 10:23:22 -04:00
Ezio Melotti
45763d0d12
Merge with 3.2.
2011-03-20 15:34:28 +02:00
Ezio Melotti
60c3c9f918
Save a copy of sys.warnoptions in test_program.
2011-03-20 15:31:26 +02:00
Ezio Melotti
0123e055fa
Add a check for sys.warnoptions in regrtest.
2011-03-20 15:09:26 +02:00
Victor Stinner
cc9564ecd8
Issue #3080 : Fix call to case_ok() in find_init_module()
2011-03-20 04:58:29 +01:00
Victor Stinner
1304f2d8a3
Issue #3080 : Fix case_ok() using case_bytes()
...
Invert name and namelen arguments.
2011-03-20 04:28:55 +01:00
Senthil Kumaran
bec7886e3f
Merge from 3.1
2011-03-20 10:45:10 +08:00
Senthil Kumaran
1b407fe658
Issue #11567 - Let's have the DOCTYPE as HTML instead of XHTML.
2011-03-20 10:44:30 +08:00
Senthil Kumaran
799c669283
Add NEWS for Issue #11563 .
2011-03-20 09:26:57 +08:00