summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge patchcheck changes with 3.3Ezio Melotti2013-01-111-1/+2
|\
| * Merge patchcheck changes with 3.2Ezio Melotti2013-01-111-1/+2
| |\
| | * Add a note about checking refleaks to patchcheck.Ezio Melotti2013-01-111-1/+2
| | |
* | | Null mergeSerhiy Storchaka2013-01-110-0/+0
|\ \ \ | |/ /
| * | Null mergeSerhiy Storchaka2013-01-110-0/+0
| |\ \ | | |/
| | * Merge headsSerhiy Storchaka2013-01-111-1/+1
| | |\
| * | \ Merge headsSerhiy Storchaka2013-01-113-105/+392
| |\ \ \
* | \ \ \ Merge headsSerhiy Storchaka2013-01-111-1/+1
|\ \ \ \ \
| * \ \ \ \ merge with 3.3Sandro Tosi2013-01-111-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge with 3.2Sandro Tosi2013-01-111-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | grammatical fix; thanks to Alex Rudnick from docs@Sandro Tosi2013-01-111-1/+1
| | | | | |
* | | | | | Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.Serhiy Storchaka2013-01-113-105/+392
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | 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.
| * | | | Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.Serhiy Storchaka2013-01-113-105/+392
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | 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.
| | * | Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py.Serhiy Storchaka2013-01-113-105/+392
| | |/ | | | | | | | | | | | | | | | | | | 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.
* | | #16154: merge with 3.3.Ezio Melotti2013-01-115-8/+11
|\ \ \ | |/ /
| * | #16154: merge with 3.2.Ezio Melotti2013-01-115-8/+11
| |\ \ | | |/
| | * #16154: fix some doctests in Doc/library. Patch by Ravi Sinha.Ezio Melotti2013-01-115-10/+13
| | |
* | | Issue #16874 (merge from 3.3): fix some documentation formatting.Chris Jerdonek2013-01-111-6/+6
|\ \ \ | |/ /
| * | Issue #16874 (merge from 3.2): fix some documentation formatting.Chris Jerdonek2013-01-111-6/+6
| |\ \ | | |/
| | * Issue #16874 (forward-port from 2.7): fix some documentation formatting.Chris Jerdonek2013-01-111-6/+6
| | |
* | | #13899: merge with 3.3.Ezio Melotti2013-01-113-1/+10
|\ \ \ | |/ /
| * | #13899: merge with 3.2.Ezio Melotti2013-01-113-1/+10
| |\ \ | | |/
| | * #13899: \A, \Z, and \B now correctly match the A, Z, and B literals when ↵Ezio Melotti2013-01-114-1/+11
| | | | | | | | | | | | used inside character classes (e.g. [A]). Patch by Matthew Barnett.
* | | #16925: merge with 3.3.Ezio Melotti2013-01-112-35/+16
|\ \ \ | |/ /
| * | #16925: test_configparser now works with unittest test discovery. Patch by ↵Ezio Melotti2013-01-112-35/+16
| | | | | | | | | | | | Zachary Ware.
* | | #16918: merge with 3.3.Ezio Melotti2013-01-112-46/+16
|\ \ \ | |/ /
| * | #16918: test_codecs now works with unittest test discovery. Patch by Zachary ↵Ezio Melotti2013-01-112-46/+15
| | | | | | | | | | | | Ware.
| * | Merge fix for broken/disabled test.Ezio Melotti2013-01-111-1/+2
| |\ \ | | |/
| | * Enable a broken test and fix it.Ezio Melotti2013-01-111-1/+2
| | |
* | | #16919: merge with 3.3.Ezio Melotti2013-01-112-5/+9
|\ \ \ | |/ /
| * | #16919: test_crypt now works with unittest test discovery. Patch by Zachary ↵Ezio Melotti2013-01-112-5/+9
| | | | | | | | | | | | Ware.
* | | merge #13934: document sqlite version strings, use correct one in test.R David Murray2013-01-112-2/+24
|\ \ \ | |/ /
| * | merge #13934: document sqlite version strings, use correct one in test.R David Murray2013-01-112-2/+24
| |\ \ | | |/
| | * #13934: document sqlite version strings, use correct one in test.R David Murray2013-01-112-2/+24
| | |
* | | merge 3.3 (#16900)Benjamin Peterson2013-01-103-4/+10
|\ \ \ | |/ /
| * | remove __del__ because it's evil and also prevents the ResourceWarning on ↵Benjamin Peterson2013-01-103-4/+10
| | | | | | | | | | | | the socket from happening (closes #16900)
* | | merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.R David Murray2013-01-103-1/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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.
| * | merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.R David Murray2013-01-103-1/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| | * #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.R David Murray2013-01-103-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge 3.3Eli Bendersky2013-01-100-0/+0
|\ \ \ | |/ /
| * | Update Misc/NEWS for issue #16076Eli Bendersky2013-01-101-1/+6
| | |
* | | Issue #16913: Fix Element.itertext()'s handling of text with XML entities.Eli Bendersky2013-01-102-3/+18
|\ \ \ | |/ / | | | | | | Patch by Serhiy Storchaka
| * | Issue #16913: Fix Element.itertext()'s handling of text with XML entities.Eli Bendersky2013-01-103-3/+20
| | | | | | | | | | | | Patch by Serhiy Storchaka
* | | normalize whitespaceEli Bendersky2013-01-101-1/+1
|\ \ \ | |/ /
| * | normalize whitespaceEli Bendersky2013-01-101-1/+1
| | |
* | | Issue #16076: make _elementtree.Element pickle-able in a way that is compatibleEli Bendersky2013-01-102-23/+238
|\ \ \ | |/ / | | | | | | | | | | | | with the Python version of the class. Patch by Daniel Shahaf.
| * | Issue #16076: make _elementtree.Element pickle-able in a way that is compatibleEli Bendersky2013-01-103-23/+239
| | | | | | | | | | | | | | | | | | with the Python version of the class. Patch by Daniel Shahaf.
* | | #16910: merge with 3.3.Ezio Melotti2013-01-105-25/+19
|\ \ \ | |/ /
| * | #16910: test_bytes, test_unicode, and test_userstring now work with unittest ↵Ezio Melotti2013-01-105-25/+19
| | | | | | | | | | | | test discovery. Patch by Zachary Ware.
* | | #16905: merge with 3.3.Ezio Melotti2013-01-102-30/+25
|\ \ \ | |/ /