Commit Graph

53804 Commits

Author SHA1 Message Date
Vinay Sajip 3cac309939 Merged upstream change. 2012-03-13 12:15:46 +00:00
Vinay Sajip 0f15181d39 Closes #14267: Merged fix from 3.2. 2012-03-13 12:15:09 +00:00
Vinay Sajip 27f48979ca Closes #14267: Corrected computation of rollover filename. 2012-03-13 12:10:33 +00:00
Senthil Kumaran 19b114b818 merge to 3.3 - Fix closes Issue14281 - Test for cgi.escape by Brian Landers 2012-03-13 01:51:20 -07:00
Senthil Kumaran 47b5ddb9cf 3.2 - Fix closes Issue14281 - Test for cgi.escape by Brian Landers 2012-03-13 01:50:27 -07:00
Senthil Kumaran 1732ab4f15 merge heads 2012-03-13 00:16:58 -07:00
Senthil Kumaran 4bd53b13c6 merge heads 2012-03-13 00:16:17 -07:00
Senthil Kumaran 784ddb08a6 merge heads 2012-03-13 00:14:59 -07:00
Senthil Kumaran 7554f0dd3c merge heads 2012-03-13 00:14:25 -07:00
Michael Foord 5738e4f3df Merge 2012-03-13 00:14:19 -07:00
Michael Foord e01c62cd6b Fix unittest test discovery for Jython 2012-03-13 00:09:54 -07:00
R David Murray a9719057a2 #8942: add test for __path__ contents in zipimport tests
Patch by Tatiana Al-Chueyr.
2012-03-12 21:16:33 -04:00
Martin v. Löwis 2b695a4678 Issue #1178863: Separate initialisation from setting when initializing
Tkinter.Variables; harmonize exceptions to ValueError; only delete variables
that have not been deleted; assert that variable names are strings
Patch by Andrew Svetlov.
2012-03-12 17:47:35 -07:00
Sean Reifschneider 7b3c975aaf closes #14259 re.finditer() now takes keyword arguments: pos, endpos.
Contrary to the documentation, finditer() did not take pos and endpos
keyword arguments.
2012-03-12 18:22:38 -06:00
Victor Stinner 45e50de1f5 Try to fix compilation of Python-ast.c on Visual Studio 2008 2012-03-13 01:17:31 +01:00
Ezio Melotti cc50ba26bd #14179: merge with 3.2. 2012-03-13 01:33:30 +02:00
Ezio Melotti df723e1e5e #14179: add tests for re.compile. Patch by Florian Mladitsch. 2012-03-13 01:29:48 +02:00
Victor Stinner a8ec5ea923 Issue #14104: Implement time.monotonic() on Mac OS X,
patch written by Nicholas Riley.
2012-03-13 00:25:42 +01:00
Łukasz Langa cad1a07bec minor PEP7-related fix 2012-03-12 23:41:07 +01:00
Eric V. Smith f2bb8898ea Merge heads. 2012-03-12 15:29:06 -07:00
Eric V. Smith 97722c4132 str.format_map tests don't do what they say: fix to actually implement the intent of the test. Closes #13450. Patch by Akira Li. 2012-03-12 15:26:21 -07:00
Michael Foord 56bac7b9e1 Merge 2012-03-12 15:25:12 -07:00
Michael Foord b36c70c9ff Move adding unittest test discovery command line options into their own method. 2012-03-12 15:24:46 -07:00
Eric V. Smith 1d4798cb93 Merge heads. 2012-03-12 15:18:30 -07:00
Eric V. Smith edbb6ca084 str.format_map tests don't do what they say: fix to actually implement the intent of the test. Closes #13450. 2012-03-12 15:16:22 -07:00
Łukasz Langa d5c613e45f Head merge 2012-03-12 22:59:49 +01:00
Łukasz Langa dbd7825d56 #13842: check whether PyUnicode_FromString succeeded 2012-03-12 22:59:11 +01:00
Ezio Melotti 48d578c02a #13394: add more tests for the aifc module and use warnings.warn instead of print. Patch by Oleg Plakhotnyuk. 2012-03-12 23:57:18 +02:00
Ezio Melotti 85769539a3 #13394: add more tests for the aifc module. Patch by Oleg Plakhotnyuk. 2012-03-12 23:52:40 +02:00
Michael Foord c1f5d8af57 Merge 2012-03-12 13:54:03 -07:00
Michael Foord 5f99ced092 Refactor unittest command line handling to always use optparse 2012-03-12 13:53:04 -07:00
Łukasz Langa 17591c1a1d Head merge. 2012-03-12 19:59:48 +01:00
Łukasz Langa f3078fbee2 Fixes #13842: cannot pickle Ellipsis or NotImplemented.
Thanks for James Sanders for the bug report and the patch.
2012-03-12 19:46:12 +01:00
Benjamin Peterson f28fcff17d adjust for change in AST type 2012-03-12 11:19:19 -07:00
Benjamin Peterson 518cf94ad7 merge 3.2 2012-03-12 11:16:03 -07:00
Benjamin Peterson 3f3584695e kill this disabled code 2012-03-12 11:15:48 -07:00
Benjamin Peterson bebcd18b75 merge 3.2 2012-03-12 11:02:10 -07:00
Benjamin Peterson bc4665ebcb use correct naming convention 2012-03-12 11:00:41 -07:00
Senthil Kumaran 9186850088 closes issue14257 - Grammatical fix 2012-03-12 10:05:58 -07:00
Senthil Kumaran 6080db7606 closes issue14257 - Grammatical fix 2012-03-12 10:05:34 -07:00
Benjamin Peterson 7e0dbfbbde give the AST class a __dict__ 2012-03-12 09:46:44 -07:00
Benjamin Peterson 61a4161de4 merge 3.2 2012-03-12 09:43:27 -07:00
Benjamin Peterson ef87f06798 allow AST objects to be like its subclasses 2012-03-12 09:43:09 -07:00
Benjamin Peterson 6645f7e590 merge heads 2012-03-12 09:28:51 -07:00
Benjamin Peterson 09b4bd03f6 merge 3.2 2012-03-12 09:28:36 -07:00
Benjamin Peterson 800b3aa57f merge heads 2012-03-12 09:28:26 -07:00
Benjamin Peterson d279e286f2 every other ast object has a dict, so I think AST should, too 2012-03-12 09:27:36 -07:00
Eric V. Smith e976fc7464 Merge. 2012-03-11 22:47:07 -07:00
Eric V. Smith 851cad7616 Make test_logging no longer fail if zlib not present. Closes #14256. Patch by Pedro Kroger. 2012-03-11 22:46:04 -07:00
Senthil Kumaran 68e994e9e4 closes issue14257 - cpython - minor error in glossary wording regarding __hash__ 2012-03-11 21:06:03 -07:00