Commit Graph

48489 Commits

Author SHA1 Message Date
Benjamin Peterson 0a5dad9ef1 fix spacing 2011-05-27 14:17:04 -05:00
Benjamin Peterson 5218853c67 merge 3.1 2011-05-27 14:10:36 -05:00
Benjamin Peterson 74897ba46f fix indentation 2011-05-27 14:10:24 -05:00
Éric Araujo f33de71514 Minor doc addition for clarity 2011-05-27 04:42:47 +02:00
Éric Araujo e0854f9dbf Add missing closing paren 2011-05-27 04:36:52 +02:00
Éric Araujo b5096f739b Merge 3.1 2011-05-26 16:50:31 +02:00
Éric Araujo d4ae04fdb8 Branch merge 2011-05-26 16:50:19 +02:00
Éric Araujo dec2067b2a Branch merge 2011-05-26 16:49:59 +02:00
Stefan Krah f2c6db5fac Issue #12090: backport 79fcd71d0356 2011-05-26 00:37:45 +02:00
Victor Stinner 988512cfd7 (Merge 3.1) Issue #12175: RawIOBase.readall() now returns None if read()
returns None.
2011-05-25 22:49:15 +02:00
Victor Stinner a80987f20d Issue #12175: RawIOBase.readall() now returns None if read() returns None. 2011-05-25 22:47:16 +02:00
Victor Stinner 4767114e77 (Merge 3.1) Issue #12175: FileIO.readall() now raises a ValueError instead of
an IOError if the file is closed.
2011-05-25 22:11:55 +02:00
Victor Stinner b79f28ccbd Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if
the file is closed.
2011-05-25 22:09:03 +02:00
É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