Brett Cannon
7385adc84c
Issue #15715 : Ignore failed imports triggered by the use of fromlist.
...
When the fromlist argument is specified for __import__() and the
attribute doesn't already exist, an import is attempted. If that fails
(e.g. module doesn't exist), the ImportError will now be silenced (for
backwards-compatibility). This *does not* affect
``from ... import ...`` statements.
Thanks to Eric Snow for the patch and Simon Feltman for reporting the
regression.
2012-08-17 13:21:16 -04:00
Richard Oudkerk
b391b24efe
Merge
2012-08-17 15:05:09 +01:00
Richard Oudkerk
d9c026fd77
Issue #15412 : Remove erroneous note about weakrefs
2012-08-17 15:02:47 +01:00
Richard Oudkerk
67a58cc515
Merge
2012-08-17 14:42:43 +01:00
Richard Oudkerk
264e9ac5f5
Issue #14501 : Clarify that authentication keys are byte strings
2012-08-17 14:39:18 +01:00
Antoine Pitrou
d9a7e70939
Update the getpeercert() example with a real-world cert showing non-trivial issuer, subject and subjectAltName.
2012-08-16 22:18:37 +02:00
Antoine Pitrou
b7c6c8105e
Update the getpeercert() example with a real-world cert showing non-trivial issuer, subject and subjectAltName.
2012-08-16 22:14:43 +02:00
Andrew Svetlov
943c5b31b6
Fix subprocess test broken on Windows
2012-08-16 20:17:47 +03:00
Richard Oudkerk
04ec8ce1bb
Issue #14669 : Fix pickling of connections and sockets on MacOSX
...
by sending/receiving an acknowledgment after file descriptor transfer.
TestPicklingConnection has been reenabled for MacOSX.
2012-08-16 16:48:55 +01:00
Petri Lehtinen
69a06dd59d
#11062 : Fix universal newline support in Babyl._install_message()
2012-08-16 07:27:53 +03:00
Petri Lehtinen
88614948c0
#11062 : Fix universal newline support in Babyl._install_message()
...
When adding a message from a binary file, \r\n was translated to
\r\r\n in the message body.
2012-08-16 07:27:01 +03:00
Nick Coghlan
0e41628d35
Merge str docstring fix from 3.2
2012-08-16 14:14:30 +10:00
Nick Coghlan
573b1fd779
Fix str docstring
2012-08-16 14:13:07 +10:00
Antoine Pitrou
721738fbee
Issue #15604 : Update uses of PyObject_IsTrue() to check for and handle errors correctly.
...
Patch by Serhiy Storchaka.
2012-08-15 23:20:39 +02:00
Antoine Pitrou
6f430e4963
Issue #15604 : Update uses of PyObject_IsTrue() to check for and handle errors correctly.
...
Patch by Serhiy Storchaka.
2012-08-15 23:18:25 +02:00
Andrew Svetlov
9351117139
merge heads
2012-08-15 22:53:56 +03:00
Andrew Svetlov
5395d2f07d
Add yet another test for subprocess.Popen.communicate
2012-08-15 22:46:43 +03:00
Sandro Tosi
eb41c7fef8
merge with 3.2
2012-08-15 21:37:56 +02:00
Sandro Tosi
dd7c55250d
clarify in/not in in case of infinite iterators; thanks to Sergey Skovorodkin from docs@
2012-08-15 21:37:35 +02:00
R David Murray
0689ce4396
#15543 : reflow paragraph.
2012-08-15 11:13:31 -04:00
R David Murray
99d439afcf
#15543 : additional link in subprocess docs.
...
Patch by Chris Jerdonek.
2012-08-15 11:12:15 -04:00
R David Murray
27bbcfb8ff
Merge #15543 : glossary entry for and 'universal newlines', and links to it.
...
Patch by Chris Jerdonek.
2012-08-15 11:11:27 -04:00
R David Murray
ee0a945ae4
#15543 : reflow paragraphs.
2012-08-15 11:05:36 -04:00
R David Murray
1b00f25bf9
#15543 : glossary entry for and 'universal newlines', and links to it.
...
Patch by Chris Jerdonek.
2012-08-15 10:43:58 -04:00
Andrew Svetlov
592df20efc
Cleanup universal_newlines usage for subprocess.Popen, remove unused param.
2012-08-15 17:36:15 +03:00
Eli Bendersky
bdbc0b08d0
merge 3.2
2012-08-15 14:51:08 +03:00
Eli Bendersky
f748a3773f
merge heads in 3.2 branch
2012-08-15 14:50:52 +03:00
Eli Bendersky
8f773493b6
Issue #15656 : fixing code sample in extending doc
2012-08-15 14:49:49 +03:00
Petri Lehtinen
aae61b8cd0
#11062 : Fix adding a message from file to Babyl mailbox
2012-08-15 14:36:14 +03:00
Eli Bendersky
3115f0d14b
Issue #15586 : typo fix. This commit is accompanied by an apology for all Liechtensteiners out there, and a thanks to Eric Araujo for noticing.
2012-08-15 14:26:30 +03:00
Petri Lehtinen
3d12c4317c
#11062 : Fix adding a message from file to Babyl mailbox
2012-08-15 14:26:27 +03:00
R David Murray
7f84833726
Merge #15269 : document dircmp.left and right, and add tests for them.
...
Patch by Chris Jerdonek.
2012-08-14 21:45:25 -04:00
R David Murray
2b209cd78d
#15269 : document dircmp.left and right, and add tests for them.
...
Patch by Chris Jerdonek.
2012-08-14 21:40:13 -04:00
Sandro Tosi
488cc36123
merge with 3.2
2012-08-14 19:52:04 +02:00
Sandro Tosi
a17ef14632
fix typo
2012-08-14 19:51:43 +02:00
Andrew Svetlov
c85951eb4c
Merge heads
2012-08-14 18:42:54 +03:00
Andrew Svetlov
c53eb9dfe2
Merge 3.2 to default
2012-08-14 18:42:10 +03:00
Andrew Svetlov
4092e3653c
Merge 3.2
2012-08-14 18:41:40 +03:00
Andrew Svetlov
aa0dbdc2dd
Issue #15592 . Fix regression: subprocess.communicate() breaks on no input with universal newlines true.
...
Patch by Chris Jerdonek.
2012-08-14 18:40:21 +03:00
Andrew Svetlov
f3765071eb
Add test to explicit check the absence regression in subprocess (issue #15592 ).
...
Patch by Chris Jerdonek.
2012-08-14 18:35:17 +03:00
Matthias Klose
6ef977484d
merge 3.2
2012-08-14 17:30:12 +02:00
Matthias Klose
d182a6c77e
Modules/socketmodule.c: netdb_lock: define static.
2012-08-14 17:29:04 +02:00
Andrew Svetlov
f06afe35b9
Issue #14167 : Document return statement in finally blocks.
...
Patch by Yury Selivanov.
2012-08-14 15:38:58 +03:00
Andrew Svetlov
f158d86074
Issue #14167 : Document return statement in finally blocks.
...
Patch by Yury Selivanov.
2012-08-14 15:38:15 +03:00
Richard Oudkerk
3165a75e45
Merge 3.2
2012-08-14 12:51:14 +01:00
Richard Oudkerk
e88a2445bc
Issue #15646 : Prevent equivalent of a fork bomb when using multiprocessing
...
on Windows without the "if __name__ == '__main__'" idiom.
2012-08-14 11:41:32 +01:00
Georg Brandl
e471772fff
Review of signature docs.
2012-08-14 09:45:28 +02:00
Georg Brandl
1487c931cb
merge with 3.2
2012-08-14 09:40:26 +02:00
Georg Brandl
296d1bea6a
Restore original line lengths.
2012-08-14 09:39:07 +02:00
Eli Bendersky
9c7e100ccd
Add Daniel Ellis to Misc/ACKS
2012-08-14 07:20:06 +03:00
