Commit Graph

75798 Commits

Author SHA1 Message Date
Ezio Melotti 9895ab463b #16940: merge with 3.2. 2013-01-12 10:40:24 +02:00
Ezio Melotti 7128e073e2 #16940: fix indentation in example. 2013-01-12 10:39:45 +02:00
Chris Jerdonek 71e39fb484 Issue #16933 (merge from 3.2): Improve choices examples in argparse docs. 2013-01-11 19:28:05 -08:00
Chris Jerdonek 174ef67b56 Issue #16933 (2.7 forward-port): Improve choices examples in argparse docs. 2013-01-11 19:26:44 -08:00
Brett Cannon ed6b4c0020 merge 2013-01-11 15:44:00 -05:00
Brett Cannon a9976b3e32 Issue #16730: Don't raise an exception in
importlib.machinery.FileFinder when the directory has become
unreadable or a file. This brings semantics in line with Python 3.2
import.

Reported and diagnosed by David Pritchard.
2013-01-11 15:40:12 -05:00
Serhiy Storchaka b4fb2e2aac Issue #15539: Fix a backup file creation in pindent.py on Windows. 2013-01-11 22:19:07 +02:00
Serhiy Storchaka a3a01b6ac3 Issue #15539: Fix a backup file creation in pindent.py on Windows. 2013-01-11 22:18:17 +02:00
Georg Brandl 154dc4e423 Closes #16936: fix duplicate/ambiguous description of stat.S_IFMT in the docs. 2013-01-11 20:25:54 +01:00
Ezio Melotti 8762595ef3 Merge patchcheck changes with 3.2 2013-01-11 14:12:20 +02:00
Ezio Melotti 5e12bb728f Add a note about checking refleaks to patchcheck. 2013-01-11 14:07:47 +02:00
Serhiy Storchaka 69c753d9a6 Null merge 2013-01-11 12:34:21 +02:00
Serhiy Storchaka 5150a3393d Merge heads 2013-01-11 12:32:37 +02:00
Serhiy Storchaka fd25ffa012 Merge heads 2013-01-11 12:28:53 +02:00
Serhiy Storchaka 40ce22edb5 Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.
Now pindent.py works with a "with" statement.  pindent.py no longer produces
improper indentation.  pindent.py now works with continued lines broken after
"class" or "def" keywords and with continuations at the start of line.  Added
regression tests for pindent.py.  Modernized pindent.py.
2013-01-11 12:10:57 +02:00
Serhiy Storchaka 6840a54ad4 Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.
Now pindent.py works with a "with" statement.  pindent.py no longer produces
improper indentation.  pindent.py now works with continued lines broken after
"class" or "def" keywords and with continuations at the start of line.  Added
regression tests for pindent.py.  Modernized pindent.py.
2013-01-11 12:04:23 +02:00
Sandro Tosi a525fc161a merge with 3.2 2013-01-11 10:49:28 +01:00
Sandro Tosi 32587fbb89 grammatical fix; thanks to Alex Rudnick from docs@ 2013-01-11 10:49:00 +01:00
Ezio Melotti 5a4b03dd82 #16154: merge with 3.2. 2013-01-11 09:12:28 +02:00
Ezio Melotti 405079213b #16154: fix some doctests in Doc/library. Patch by Ravi Sinha. 2013-01-11 09:09:07 +02:00
Chris Jerdonek b2b2252a81 Issue #16874 (merge from 3.2): fix some documentation formatting. 2013-01-10 23:03:42 -08:00
Chris Jerdonek 444d153d7e Issue #16874 (forward-port from 2.7): fix some documentation formatting. 2013-01-10 23:01:27 -08:00
Ezio Melotti adfbb8e8ec #13899: merge with 3.2. 2013-01-11 08:43:53 +02:00
Ezio Melotti fe8e6e7414 #13899: \A, \Z, and \B now correctly match the A, Z, and B literals when used inside character classes (e.g. [A]). Patch by Matthew Barnett. 2013-01-11 08:32:01 +02:00
Ezio Melotti dc1fa80b6c #16925: test_configparser now works with unittest test discovery. Patch by Zachary Ware. 2013-01-11 06:30:57 +02:00
Ezio Melotti 5d3dba0d27 #16918: test_codecs now works with unittest test discovery. Patch by Zachary Ware. 2013-01-11 06:02:07 +02:00
Ezio Melotti e0b87edd7f Merge fix for broken/disabled test. 2013-01-11 05:57:58 +02:00
Ezio Melotti 26ed234052 Enable a broken test and fix it. 2013-01-11 05:54:57 +02:00
Ezio Melotti 90bbbd1164 #16919: test_crypt now works with unittest test discovery. Patch by Zachary Ware. 2013-01-11 05:18:45 +02:00
R David Murray d394455aae merge #13934: document sqlite version strings, use correct one in test. 2013-01-10 20:19:35 -05:00
R David Murray 3f7beb99dd #13934: document sqlite version strings, use correct one in test. 2013-01-10 20:18:21 -05:00
Benjamin Peterson 36f7b97787 remove __del__ because it's evil and also prevents the ResourceWarning on the socket from happening (closes #16900) 2013-01-10 14:16:20 -06:00
R David Murray 7bd04867e5 merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
2013-01-10 11:13:34 -05:00
R David Murray b52312923b #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
2013-01-10 11:04:09 -05:00
Eli Bendersky 8eee081d40 Update Misc/NEWS for issue #16076 2013-01-10 06:35:18 -08:00
Eli Bendersky e6174ca85e Issue #16913: Fix Element.itertext()'s handling of text with XML entities.
Patch by Serhiy Storchaka
2013-01-10 06:27:53 -08:00
Eli Bendersky 458c0d5a77 normalize whitespace 2013-01-10 06:07:00 -08:00
Eli Bendersky 698bdb2a6c Issue #16076: make _elementtree.Element pickle-able in a way that is compatible
with the Python version of the class.

Patch by Daniel Shahaf.
2013-01-10 06:01:06 -08:00
Ezio Melotti 0dceb560b6 #16910: test_bytes, test_unicode, and test_userstring now work with unittest test discovery. Patch by Zachary Ware. 2013-01-10 07:43:26 +02:00
Ezio Melotti 2688e81064 #16905: test_bufio now works with unittest test discovery. Initial patch by Berker Peksag. 2013-01-10 06:52:23 +02:00
Ezio Melotti b21af554ee #16898: test_bufio now works with unittest test discovery. Patch by Zachary Ware. 2013-01-10 06:11:34 +02:00
Ezio Melotti 1d3e96dbe2 #16888: test_array now works with unittest test discovery. Patch by Zachary Ware. 2013-01-10 06:04:50 +02:00
Ezio Melotti 47236db1d0 #16896: test_asyncore now works with unittest test discovery. Patch by Zachary Ware. 2013-01-10 05:28:52 +02:00
Ezio Melotti f472a90d31 #16897: test_bisect now works with unittest test discovery. Initial patch by Zachary Ware. 2013-01-10 04:32:01 +02:00
Ezio Melotti e212370fea Use correct methods in unittest.mock examples. 2013-01-10 03:43:33 +02:00
Ezio Melotti d0dfe9ad46 #16852: test_genericpath, test_posixpath, test_ntpath, and test_macpath now work with unittest test discovery. Patch by Zachary Ware. 2013-01-10 03:12:50 +02:00
Benjamin Peterson 0c270a8bb7 correct static string clearing loop (closes #16906) 2013-01-09 09:52:01 -06:00
Serhiy Storchaka 7131749959 Issue #16491: IDLE now prints chained exception tracebacks. 2013-01-09 12:24:48 +02:00
Serhiy Storchaka 78470b4c3a Issue #16491: IDLE now prints chained exception tracebacks. 2013-01-09 12:21:57 +02:00
Serhiy Storchaka 369a7822d6 Issue #16843: Make concurrent tests for sched module deterministic. 2013-01-09 00:13:38 +02:00