Commit Graph

57297 Commits

Author SHA1 Message Date
Gregory P. Smith 93b5b33e65 merge heads 2012-09-29 11:56:56 -07:00
Gregory P. Smith 8ce589cf7b merge heads 2012-09-29 11:56:41 -07:00
Gregory P. Smith 9ab240a24e merge heads 2012-09-29 11:56:11 -07:00
Gregory P. Smith 288d9aec4b Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD to
return a returncode of 0 when the child has already exited or cannot be
waited on.
2012-09-29 11:55:16 -07:00
Gregory P. Smith 02dee1acd8 Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD
to return a returncode of 0 when the child has already exited or cannot be
waited on.
2012-09-29 11:53:08 -07:00
R David Murray a09fc13c07 Merge #16085: Don't promote shadowing builtins in the configparser example. 2012-09-29 14:41:26 -04:00
R David Murray ad4d9c9bf0 Merge #16085: Don't promote shadowing builtins in the configparser example. 2012-09-29 14:40:56 -04:00
Gregory P. Smith 3905171f1e Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD
to return a returncode of 0 when the child has already exited or cannot
be waited on.
2012-09-29 11:40:38 -07:00
R David Murray 1a1883d566 #16085: Don't promote shadowing builtins in the configparser example. 2012-09-29 14:40:23 -04:00
R David Murray 1ed3ffebb9 Merge: Clarify description of who needs to worry about importlib changes. 2012-09-29 14:35:44 -04:00
R David Murray cff1c6f665 Clarify description of who needs to worry about importlib changes. 2012-09-29 14:34:43 -04:00
Benjamin Peterson 697be40366 merge 3.3 nully 2012-09-29 14:20:09 -04:00
Benjamin Peterson 14fb44e1ba merge mostly from default 2012-09-29 14:14:19 -04:00
Benjamin Peterson 9201214c2c merge heads 2012-09-29 13:47:47 -04:00
Benjamin Peterson b8350f1c7d upgrade to UCD 6.2 2012-09-29 13:47:39 -04:00
R David Murray f3aef05e6b Merge: Add smtpd changes to whatsnew, and integrate 'other' section.
Also made the smtplib markup consistent with the rest of the markup.
2012-09-29 11:43:21 -04:00
R David Murray 1764c80925 Add smtpd changes to whatsnew, and integrate 'other' section.
Also made the smtplib markup consistent with the rest of the markup.
2012-09-29 11:42:36 -04:00
R David Murray 9094b1bc50 Merge: Remove visible XXX in What's New. 2012-09-29 10:53:55 -04:00
R David Murray defdb16a3c Remove visible XXX in What's New. 2012-09-29 10:53:31 -04:00
R David Murray fa72df799b Merge: Document the addition of 'quote' to shlex in What's New. 2012-09-29 09:49:32 -04:00
R David Murray aae25833dc Document the addition of 'quote' to shlex in What's New. 2012-09-29 09:49:05 -04:00
Georg Brandl ede184996c null-merge from 3.3 2012-09-29 14:22:04 +02:00
Georg Brandl ac76833033 Post-release update. 2012-09-29 14:21:25 +02:00
Martin v. Löwis aa909e4200 Merge with 3.3 2012-09-29 13:10:09 +02:00
Martin v. Löwis 77cc86f873 Ajdust path to launcher for non-PGO-builds 2012-09-29 13:08:41 +02:00
Georg Brandl 8850664d26 merge with 3.3 2012-09-29 09:51:42 +02:00
Georg Brandl d31234166f Re-tagging 3.3.0 for test_sys fix. 2012-09-29 09:47:26 +02:00
Georg Brandl e054f452bd Fix test_sys.test_implementation for final releases. 2012-09-29 09:44:17 +02:00
Georg Brandl 26eb110e82 Set up "source" links to point to default branch. 2012-09-29 09:36:04 +02:00
Georg Brandl 08a9012352 Bump version to 3.4.0 alpha 0. 2012-09-29 09:34:13 +02:00
Georg Brandl c7d7136c69 RPM spec file name update for 3.4 branch. 2012-09-29 09:29:44 +02:00
Georg Brandl 99a247fd01 Merge with main repo default branch. 2012-09-29 09:27:15 +02:00
Georg Brandl 1628eaa5dc Added tag v3.3.0 for changeset de6b91d97113 2012-09-29 09:06:16 +02:00
Georg Brandl 1d021738e2 Update release date in whatsnew document. 2012-09-29 09:06:10 +02:00
Georg Brandl c7dcd50e4e Bump version to 3.3.0 final. 2012-09-29 09:04:54 +02:00
Georg Brandl d6e857b0da Point "source" links in the docs to the 3.3 versions in the repo. 2012-09-29 09:03:54 +02:00
Georg Brandl a79b8dc917 Add a versionchanged note for #9374 changes. 2012-09-29 08:59:23 +02:00
Brett Cannon 8ed677db12 Add some comments. 2012-09-28 16:41:39 -04:00
R David Murray 7dcbd2c873 Merge #16071: fix more email.message links in mailbox docs. 2012-09-28 15:19:42 -04:00
R David Murray 5320250485 #16071: fix more email.message links in mailbox docs. 2012-09-28 15:19:16 -04:00
R David Murray fb8a49e080 Merge #16071: fix links to email.message.Message in mailbox docs. 2012-09-28 15:10:12 -04:00
R David Murray c5fe4073af #16071: fix links to email.message.Message in mailbox docs. 2012-09-28 15:09:31 -04:00
Stefan Krah 8a491a8eef Closes #16080: The decorator ignores failed attempts to set the required
locale, so an additional check is required.
2012-09-28 17:17:11 +02:00
Michael Foord 8ec31c2006 Merge 2012-09-28 16:16:24 +01:00
Michael Foord 28d591ceef Closes issue 15323. Improve failure message of Mock.assert_called_once_with 2012-09-28 16:15:22 +01:00
Georg Brandl 811b981fcb Move NEWS items from 3.3.0 to that section, to ease merging from the release clone later. 2012-09-28 17:10:11 +02:00
Jesus Cea 494502756e MERGE: Closes #15953: Incorrect some fields declaration in the PyTypeObject documentation 2012-09-28 16:35:21 +02:00
Jesus Cea 33b5769db5 Closes #15953: Incorrect some fields declaration in the PyTypeObject documentation 2012-09-28 16:34:45 +02:00
Stefan Krah d5dc6e50ff Merge. 2012-09-28 16:21:17 +02:00
Chris Jerdonek 18581efe36 Close issue #16073: merge fix from 3.2. 2012-09-28 07:24:24 -07:00