Commit Graph

304 Commits

Author SHA1 Message Date
Benjamin Peterson ca6142948e merge 3.3 2013-01-03 20:34:58 -08:00
Benjamin Peterson bf064b3911 merge 3.2 2013-01-03 20:34:49 -08:00
Benjamin Peterson d73f369f4c merge heads 2013-01-03 20:34:40 -08:00
Benjamin Peterson 0a2c4f55c4 drop email (closes #16857) 2013-01-03 20:34:19 -08:00
Ezio Melotti e34ccb6861 #16760: merge with 3.3. 2012-12-25 18:16:31 +02:00
Ezio Melotti 1bdb638ce3 #16760: merge with 3.2. 2012-12-25 18:15:28 +02:00
Ezio Melotti 090f7be6df #16760: use ref:`match-objects` instead of :class:`MatchObject`. 2012-12-25 18:10:49 +02:00
Andrew Svetlov a191959849 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:27:16 +02:00
Andrew Svetlov 5b89840d9c Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:26:36 +02:00
Andrew Svetlov 737fb89dd1 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:14:22 +02:00
Andrew Svetlov 47395617bc Issue #16261: fix bare excepts in Doc/ 2012-11-02 22:07:26 +02:00
Chris Jerdonek 006d907afc Undo changes accidentally reverted in de8787029fe4. 2012-10-12 20:28:26 -07:00
Benjamin Peterson b548d49f65 merge heads 2012-10-12 12:05:01 -04:00
Benjamin Peterson 143d034ecd merge 3.2 2012-10-12 12:04:32 -04:00
Ezio Melotti eb818193b3 Merge doctest fixes in functional howto with 3.2. 2012-10-12 13:25:54 +03:00
Ezio Melotti 35cbf16202 Make doctests pass in the functional howto. 2012-10-12 13:24:19 +03:00
Ezio Melotti dd67c1d91a Merge functional howto improvements with 3.2. 2012-10-12 13:23:32 +03:00
Ezio Melotti 45a101db1d Improve markup in functional.rst, and fix a couple of errors. 2012-10-12 12:42:51 +03:00
Ezio Melotti a6229e6ebd Fix and add more links. 2012-10-12 10:59:14 +03:00
Senthil Kumaran 570bc4c465 Fix Issue 15922: make howto/urllib2.rst doctests pass.
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:38:17 -07:00
Senthil Kumaran 1ed9847a5a Fix Issue 15922: make howto/urllib2.rst doctests pass.
Patch by Chris Jerdonek. Address Ezio's review comment.
2012-10-09 00:37:09 -07:00
Eli Bendersky 948af23a77 Issue #15888: fixing problems in ipaddress doctests. Patch by Chris Jerdonek 2012-10-07 07:23:50 -07:00
Ezio Melotti 2b7a71d6e5 #15949, #15899: merge with 3.2. 2012-09-23 16:03:21 +03:00
Ezio Melotti 20b8d992b0 #15949, #15899: use \ufffd instead of ?. 2012-09-23 15:55:14 +03:00
Ezio Melotti fb436c4eba #15949, 15899: merge with 3.2. 2012-09-22 11:25:22 +03:00
Ezio Melotti b1d0e5b11e #15949, 15899: avoid using non-latin1 chars in the doc (they break `make all-pdf`). 2012-09-22 11:23:06 +03:00
Ezio Melotti 8646e8ea72 #15920: merge with 3.2. 2012-09-17 05:30:58 +03:00
Ezio Melotti 13bec9b315 #15920: fix doctests in Doc/howto/regex.rst. Patch by Chris Jerdonek. 2012-09-17 05:29:47 +03:00
Senthil Kumaran e4eee73293 merge. Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek. 2012-09-11 03:20:22 -07:00
Senthil Kumaran 2fd8bdbc9d Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek. 2012-09-11 03:17:52 -07:00
Sandro Tosi eb41c7fef8 merge with 3.2 2012-08-15 21:37:56 +02:00
Sandro Tosi dd7c55250d clarify in/not in in case of infinite iterators; thanks to Sergey Skovorodkin from docs@ 2012-08-15 21:37:35 +02:00
Eli Bendersky dfd72bbc4d Issue #14814: fix some typos in howto/ipaddress.rst 2012-07-31 17:25:33 +03:00
Vinay Sajip a61b45980b Merged documentation update from 3.2. 2012-07-27 10:55:16 +01:00
Vinay Sajip a58d668fd9 Improved cookbook entry and fixed typo. 2012-07-27 10:54:10 +01:00
Nick Coghlan ccd712a8d1 Issue 14814: Further clean ups to the ipaddress tutorial 2012-07-07 22:53:46 +10:00
Nick Coghlan b582ecc562 Issue 14814: Explain how to get more error detail in the ipaddress tutorial, and tweak the display for octet errors in IPv4 (noticed the formatting problem when adding to the docs) 2012-07-07 22:15:22 +10:00
Nick Coghlan 9680bdb567 Issue #14814: Add first draft of PEP 3144 ipaddress module documentation (initial patch by Sandro Tosi) 2012-06-17 17:24:10 +10:00
Sandro Tosi c816290059 Issue #14814: use print() function 2012-06-02 17:16:33 +02:00
Nick Coghlan 53c920052b Issue #14814: Add a basic ipaddress tutorial (thanks to Sandro Tosi for the initial conversion from Peter Moody's wiki version) 2012-05-27 01:53:33 +10:00
Georg Brandl 75d5d8c781 Merge with 3.2. 2012-05-06 21:39:59 +02:00
Georg Brandl 0958a4d63d Fix document title for Sphinx. 2012-05-06 21:39:35 +02:00
Ezio Melotti b55d9e3e19 #14034: merge indentation fixes from 3.2. 2012-05-06 17:05:54 +03:00
Ezio Melotti 9ab3fdd8cb #14034: fix indentation. 2012-05-06 17:05:16 +03:00
Ezio Melotti df5bedbf88 #14034: merge argparse tutorial from 3.2. 2012-05-06 16:34:43 +03:00
Ezio Melotti 6cc7a41c2f #14034: added the argparse tutorial. Patch by Tshepang Lekhonkhobe. 2012-05-06 16:15:35 +03:00
Georg Brandl ebb29640fa Suspicious markup check. 2012-05-01 09:29:56 +02:00
Raymond Hettinger b77b5c308d merge 2012-04-29 09:35:39 -07:00
Raymond Hettinger 99a56386f1 Issue 14688: Fix typo 2012-04-29 09:32:30 -07:00
Sandro Tosi 011c9aa822 Issue #13587: merge with 3.2 2012-04-24 17:37:02 +02:00