Commit Graph

48033 Commits

Author SHA1 Message Date
Michael Foord ed1fce2ee5 merge 3.2 2011-03-15 19:22:19 -04:00
Michael Foord dcebe0f2dc Closes issue 11133. Fixes two cases where inspect.getattr_static could trigger code execution 2011-03-15 19:20:44 -04:00
Brett Cannon 55afb1a263 Undo an accidental commit. 2011-03-15 18:48:52 -04:00
Brett Cannon f47e3ac7b7 merge 2011-03-15 18:45:59 -04:00
Brett Cannon b8daeda523 merge 2011-03-15 18:45:38 -04:00
Brett Cannon e73b2bb415 Be more thorough in blanking out methods grabbed off of an fp. 2011-03-15 18:45:13 -04:00
Michael Foord 72d4693336 merge 2011-03-15 18:38:41 -04:00
Michael Foord b2874b7a4c Changes to Wing IDE project file. Merge of peepholer changesets that were applied separately. 2011-03-15 18:38:09 -04:00
Michael Foord c867239a31 Wing project file update for mercurial 2011-03-15 18:19:58 -04:00
Raymond Hettinger 5bd75b8726 whitespace fix 2011-03-15 15:07:38 -07:00
Raymond Hettinger f932f747e6 whitespace fix 2011-03-15 15:06:09 -07:00
Raymond Hettinger 0661e91fed Issue 11510: Fix BUILD_SET optimizer bug. 2011-03-15 15:03:36 -07:00
Raymond Hettinger 29dcaad6eb Issue 11510: Fix BUILD_SET optimizer bug. 2011-03-15 14:50:16 -07:00
R David Murray 31f218bc6b Merge #11216: document all possible set_charset execution paths. 2011-03-15 17:43:21 -04:00
R David Murray 729c5e203d Merge #11216: document all possible set_charset execution paths. 2011-03-15 17:42:50 -04:00
R David Murray e3d09ff269 #11216: document all possible set_charset execution paths. 2011-03-15 17:41:13 -04:00
Brett Cannon b637680f7e Properly close a file in test_os. 2011-03-15 17:38:22 -04:00
Brett Cannon ee877a08e9 Don't leave around a test symlink file. 2011-03-15 17:32:14 -04:00
Brett Cannon f434ba9e4e merge 2011-03-15 17:23:21 -04:00
Brett Cannon f30645d552 Close a stream properly in test.test_pulldom.
Closes issue #11550. Thanks to Ben Hayden for some inspiration on the
solution.
2011-03-15 17:22:52 -04:00
Antoine Pitrou 765dcdede8 Merge 2011-03-15 22:06:42 +01:00
Antoine Pitrou f228e5bca5 Merge 2011-03-15 22:05:51 +01:00
Benjamin Peterson 47afc2af79 PyErr_Print can leave sys.last_traceback hanging around; kill it 2011-03-15 15:54:50 -05:00
Benjamin Peterson 8af4919b37 merge heads 2011-03-15 15:21:03 -05:00
Benjamin Peterson c217a4b71a should use 'is' here 2011-03-15 15:18:47 -05:00
Antoine Pitrou 126848a2d8 Fix whitespace in test_subprocess 2011-03-15 21:17:10 +01:00
Antoine Pitrou f134dceeae Merge 2011-03-15 21:11:27 +01:00
Antoine Pitrou 87541aa296 Merge 2011-03-15 21:11:04 +01:00
Antoine Pitrou 8213cafd62 Merge 2011-03-15 21:10:33 +01:00
Benjamin Peterson 0de5fc51ff merge 3.2 2011-03-15 15:10:29 -05:00
Antoine Pitrou 0e63f59492 Merge fix for issue #11501 2011-03-15 21:08:50 +01:00
Benjamin Peterson 709ac7b0a2 merge heads 2011-03-15 15:08:34 -05:00
Benjamin Peterson ffd1f48306 merge heads 2011-03-15 15:08:05 -05:00
Benjamin Peterson 485119eb1e kill PY_PATCHLEVEL_REVISION 2011-03-15 15:07:20 -05:00
Antoine Pitrou e870623e96 Merge fix for issue #11501 2011-03-15 21:05:36 +01:00
Benjamin Peterson bb375d66b8 merge 3.2 2011-03-15 15:05:22 -05:00
Gregory P. Smith d3967d4cca merge head 2011-03-15 16:04:54 -04:00
Gregory P. Smith 31a248bded Misc/NEWS entry for issue 11432 2011-03-15 16:04:15 -04:00
Benjamin Peterson 274f5fa501 merge 3.1 2011-03-15 15:04:06 -05:00
Brett Cannon 71f1363c34 merge 2011-03-15 16:03:32 -04:00
Benjamin Peterson ec4b44b2da make this subversion artifact empty 2011-03-15 15:03:13 -05:00
Brett Cannon b880c1558e Add warnings support to test.support.args_from_interpreter_flags().
This allows the -j flag to regrtest to propagate warnings settings
properly.
2011-03-15 16:03:09 -04:00
Antoine Pitrou 2c50a09ac4 On behalf of Tarek: Issue #11501: disutils.archive_utils.make_zipfile no
longer fails if zlib is not installed. Instead, the zipfile.ZIP_STORED
compression is used to create the ZipFile. Patch by Natalia B. Bidart.
2011-03-15 21:02:59 +01:00
Gregory P. Smith 28edfeedb5 issue 11432 news entry. 2011-03-15 16:02:10 -04:00
Brett Cannon d47af53126 Move off of assertEquals() and over to assertEqual(). 2011-03-15 15:55:12 -04:00
Gregory P. Smith cdc4f963cc merge 3.2 heads 2011-03-15 15:52:09 -04:00
Gregory P. Smith c15799f88a merge heads 2011-03-15 15:51:26 -04:00
Benjamin Peterson e97a5b2bda merge heads 2011-03-15 14:45:20 -05:00
Benjamin Peterson d6afe724cb improve dis test coverage (closes #11559)
Thanks Matias Bordese. (a few modifications of my own)
2011-03-15 14:44:52 -05:00
Gregory P. Smith 961e0e85c0 revert the test_main() change from 08daf3ef6509 so that regrtest continues to run this properly. 2011-03-15 15:43:39 -04:00