Chris Jerdonek
444d153d7e
Issue #16874 (forward-port from 2.7): fix some documentation formatting.
2013-01-10 23:01:27 -08:00
Ezio Melotti
57dfb227a3
#16154 : fix some doctests in Doc/library. Patch by Ravi Sinha.
2013-01-11 08:53:10 +02:00
Chris Jerdonek
d3003cb0b2
Issue #16874 : fix formatting of setup.py upload options in documentation.
2013-01-10 22:50:40 -08:00
Ezio Melotti
ee46b6c5c4
#13899 : merge with 3.3.
2013-01-11 08:44:25 +02: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
5c4e32b131
#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
2645936e27
#16925 : merge with 3.3.
2013-01-11 06:32:06 +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
aabd0b0312
#16918 : merge with 3.3.
2013-01-11 06:05:51 +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
45d5de1500
#16919 : merge with 3.3.
2013-01-11 05:20:01 +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
32851d61f2
#15109 : revert '%'->'format' changes in 4b105d328fe7 to fix regression.
...
With '%', non-ascii worked because the '%' automatically got promoted to
unicode. With format that doesn't happen, which led to encoding errors. This
fix goes back to using %, and adds a test to make sure non-ascii string values
work in iterdump.
2013-01-10 21:10:40 -05:00
R David Murray
bcd9971b05
#13934 : document sqlite version strings.
2013-01-10 20:22:57 -05:00
R David Murray
edb0e5eb2c
merge #13934 : document sqlite version strings, use correct one in test.
2013-01-10 20:20:19 -05: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
f86b3c394c
merge 3.3 ( #16900 )
2013-01-10 14:16:42 -06: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
Benjamin Peterson
9dccb01703
use PyInt_FromSsize_t instead of PyLong_FromSsize_t ( #10182 )
2013-01-10 10:37:47 -06:00
R David Murray
d618684d65
#15545 : sort iterdump via SQL instead of in python code
...
Although there is not a regression in Python2, we make the same update here to
keep the code bases in sync.
(The fix for issue 9750 introduced a regression in Python 3 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:30:51 -05:00
R David Murray
96983afd0c
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:15:57 -05: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
15d24b7c4c
Merge 3.3
2013-01-10 06:36:07 -08:00
Eli Bendersky
8eee081d40
Update Misc/NEWS for issue #16076
2013-01-10 06:35:18 -08:00
Eli Bendersky
bb48151c8c
Issue #16913 : Fix Element.itertext()'s handling of text with XML entities.
...
Patch by Serhiy Storchaka
2013-01-10 06:31:05 -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
e474022192
normalize whitespace
2013-01-10 06:07:14 -08:00
Eli Bendersky
458c0d5a77
normalize whitespace
2013-01-10 06:07:00 -08:00
Eli Bendersky
065eeb1085
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:06:01 -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
Ned Deily
ec8f8f7959
Issue #15782 : Prevent compile errors of OS X Carbon modules _Fm, _Qd, and
...
_Qdoffs when compiling with an SDK of 10.7 or later. The OS X APIs they
wrap have long been deprecated and have now been removed with 10.7.
These modules were already empty for 64-bit builds and have been removed
in Python 3. (Original patch by Ronald Oussoren.)
2013-01-09 22:04:35 -08:00
Ezio Melotti
5b1acc0dff
#16910 : merge with 3.3.
2013-01-10 07:46:29 +02: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
47b988609f
#16905 : merge with 3.3.
2013-01-10 06:53:34 +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
09a8e163da
#16898 : merge with 3.3.
2013-01-10 06:12:43 +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
e1b0d3e123
#16888 : merge with 3.3.
2013-01-10 06:06:31 +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
af5b688f71
#16896 : merge with 3.3.
2013-01-10 05:29:33 +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
9e97071fe0
#16897 : merge with 3.3.
2013-01-10 04:33:17 +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
594f20cd00
Merge unittest.mock examples fixes.
2013-01-10 03:44:00 +02:00
Ezio Melotti
e212370fea
Use correct methods in unittest.mock examples.
2013-01-10 03:43:33 +02:00
