[issue28315] incorrect "in ?" output in 'divide' example at "Defining Clean-up Actions" in tutorial

New submission from Viorel Tabara: At https://docs.python.org/3.5/tutorial/errors.html#defining-clean-up-actions when I'm running the "divide('2', '1')" example I get: File "<stdin>", line 1, in <module> instead of the documentation output of: File "<stdin>", line 1, in ? The same message is included with the 2.7 tutorial. To wit: $ python3 Python 3.5.2 (default, Sep 14 2016, 11:28:32) [GCC 6.2.1 20160901 (Red Hat 6.2.1-1)] on linux Type "help", "copyright", "credits" or "license" for more information. division by zero! executing finally clause
$ python2 Python 2.7.12 (default, Sep 2 2016, 15:40:50) [GCC 6.2.1 20160901 (Red Hat 6.2.1-1)] on linux2 Type "help", "copyright", "credits" or "license" for more information. division by zero! executing finally clause
Nice tutorial by the way ;) Thanks! ---------- assignee: docs@python components: Documentation messages: 277731 nosy: docs@python, viorel priority: normal severity: normal status: open title: incorrect "in ?" output in 'divide' example at "Defining Clean-up Actions" in tutorial type: behavior versions: Python 2.7, Python 3.5 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- nosy: +Mariatta _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Thanks for the report. I agree, it should be <module> instead of ? I'll work on a patch for this :) ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Updated the documentation to use <module> instead of ? I also went through other examples in the page and fixed those too. ---------- keywords: +patch Added file: http://bugs.python.org/file44885/issue28315.patch _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Terry J. Reedy <tjreedy@udel.edu>: ---------- assignee: docs@python -> terry.reedy nosy: +terry.reedy stage: -> commit review versions: +Python 3.6, Python 3.7 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Terry J. Reedy added the comment: Pushed to all 4 versions in ce57a74b5223, 1bead1f0260f, c729a62d4ec5, and 89cc2a6b64aa, but I gave issue # as 28815 instead of 28315. Thanks for the clean patch for 3.5. It mostly worked for 2.7, which also had an additional item not in 3.5. The only other file in /Doc with 'in ?' is Doc/includes/test.py, which is mostly a doctest docstring. The test obviously have not been run for years and the directory puzzles me, so I left it alone. ---------- resolution: -> fixed stage: commit review -> resolved status: open -> closed _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- nosy: +jaysinh.shukla _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: According to this email, conversation with Terry, https://mail.python.org/mailman/private/core-mentorship/2016-October/003662.... adding patch for `Doc/library/ctypes.rst` ---------- hgrepos: +357 Added file: http://bugs.python.org/file44951/Doc_library_ctypes_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- hgrepos: +358 Added file: http://bugs.python.org/file44952/Doc_library_ctypes_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- hgrepos: -358 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- hgrepos: -357 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44953/Doc_library_ctypes_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44954/Doc_library_ctypes_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44955/other_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44956/other_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44957/other_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44958/other_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: @Treyy: I have uploaded patches according to your comment at Core mentorship here (https://mail.python.org/mailman/private/core-mentorship/2016-October/003662....) `Since I applied the patch, I can say in in this particular case, re-open, preferably with one or more patches. I intended to include all changes needed, at least for .rst files, and grepped with IDLE's re-based grep, but missed most of what you listed. I probably started in the wrong directory. But exclude 1. the .rej files, which are not tracked, and which you should delete. 2. the old 'What's New' files, where 'in ?' is likely correct. 3. the includes/text/py files, for reasons given in the issue. 4. the other .py files, like test_generators.py, at least initially, until it is determined why they are not failing if incorrect. Left are *.rst. At least some of the code should be run to verify that the proposed changes are correct. I would not mind a separate patch for ctypes.rst, which has half the hits. If you only reopen and do not do a patch, please copy these comments into the issue.` Please change the status of issue to `open` from `close`. Thanks! ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Terry J. Reedy <tjreedy@udel.edu>: ---------- status: closed -> open _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Terry J. Reedy added the comment: Jaysinh, unless a patch for 3.5 does not cleanly apply to 3.6, or the patch must be different in 3.6*, no 3.6 patch is needed. Ditto for 3.7/default. Mariatta's patch merged forward without problem. *In this case, 'must be different' would be because there are different code examples. The same is true for 2.7 if the 3.x patch applies cleanly there (though this is less common there). Mariatta's patch also applied to 2.7, though as I reported, I found one more change for 2.7. So when you revise in response to comments, one of each patch is enough unless you know more are needed, in which case say so. If there are problems forward-merging the other_rst patch, please report first before preparing a 3.6 patch. If there were a problem with just one of the files, I would prpbably want a 3.6 patch just for the one file. I discovered a deeper problem. In spite of the doctest annotations, the doctests is not run on the ctypes doc and at least one of the tracebacks is wrong.
whereas, on Win10, 3.5
However, when I ran make doctest, these did not show up, but they were not run. I will worry about this as a separate issue.
---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44970/all_rst_patch_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44971/v_2_7_conflict_files.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44951/Doc_library_ctypes_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44952/Doc_library_ctypes_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44953/Doc_library_ctypes_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44954/Doc_library_ctypes_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44955/other_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44956/other_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44957/other_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44958/other_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: Hello Terry, According to your instructions I had uploaded two patch files. The file named `all_rst_patch_default.diff` is applicable for version `default`, `3.5`, `3.6` and for most files of `2.7`. The file named `v_2_7_conflict_files.diff` is a correct patch of all rejected files. I have unlinked previous patch files. Please guide me if I had done mistake at any stage. Many Thanks! ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Hi Jaysinh, I reviewed your changes, they look good to me. I can't approve it, so it would still be good for a core dev here to take another pass. Thanks :) ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Cheryl Sabella added the comment: @Mariatta I believe you can do this now? ---------- nosy: +csabella _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Jaysinh, are you up for preparing a PR based on you patch? Start with the master branch. Thanks. ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: Thanks Mariatta for reminding. Please expect a Github PR from my side in next 2 days. ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- pull_requests: +1480 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset 8856940cf2e82cb17db2b684cd5732fe658605ca by Mariatta (UltimateCoder) in branch 'master': bpo-28315: Improve code examples in docs (GH-1372) https://github.com/python/cpython/commit/8856940cf2e82cb17db2b684cd5732fe658... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- stage: resolved -> backport needed _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Terry J. Reedy added the comment: Mariatta, please continue with this and assign to yourself. I now have IDLE PRs to review and apply. ---------- assignee: terry.reedy -> _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: For sure :) Thanks Terry. ---------- assignee: -> Mariatta _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- pull_requests: +1543 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- pull_requests: +1544 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset 5274faf5e360f74690ffb735e919cdba5fdbdf1c by Mariatta in branch '3.5': [3.5] bpo-28315: Improve code examples in docs (GH-1372) (#1446) https://github.com/python/cpython/commit/5274faf5e360f74690ffb735e919cdba5fd... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset af71364c3f0e9cd6cb9d83194315af0ee3c783d2 by Mariatta in branch '3.6': [3.6] bpo-28315: Improve code examples in docs (GH-1372) (#1445) https://github.com/python/cpython/commit/af71364c3f0e9cd6cb9d83194315af0ee3c... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- pull_requests: +1545 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset e1b02ff58883c68d3a5e549aa33c6dd94f915bd6 by Mariatta in branch '2.7': [2.7] bpo-28315: Improve code examples in docs (GH-1372) (#1447) https://github.com/python/cpython/commit/e1b02ff58883c68d3a5e549aa33c6dd94f9... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: We can finally close this. Thanks everyone :) ---------- stage: backport needed -> resolved status: open -> closed _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- nosy: +Mariatta _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Thanks for the report. I agree, it should be <module> instead of ? I'll work on a patch for this :) ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Updated the documentation to use <module> instead of ? I also went through other examples in the page and fixed those too. ---------- keywords: +patch Added file: http://bugs.python.org/file44885/issue28315.patch _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Terry J. Reedy <tjreedy@udel.edu>: ---------- assignee: docs@python -> terry.reedy nosy: +terry.reedy stage: -> commit review versions: +Python 3.6, Python 3.7 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Terry J. Reedy added the comment: Pushed to all 4 versions in ce57a74b5223, 1bead1f0260f, c729a62d4ec5, and 89cc2a6b64aa, but I gave issue # as 28815 instead of 28315. Thanks for the clean patch for 3.5. It mostly worked for 2.7, which also had an additional item not in 3.5. The only other file in /Doc with 'in ?' is Doc/includes/test.py, which is mostly a doctest docstring. The test obviously have not been run for years and the directory puzzles me, so I left it alone. ---------- resolution: -> fixed stage: commit review -> resolved status: open -> closed _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- nosy: +jaysinh.shukla _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: According to this email, conversation with Terry, https://mail.python.org/mailman/private/core-mentorship/2016-October/003662.... adding patch for `Doc/library/ctypes.rst` ---------- hgrepos: +357 Added file: http://bugs.python.org/file44951/Doc_library_ctypes_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- hgrepos: +358 Added file: http://bugs.python.org/file44952/Doc_library_ctypes_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- hgrepos: -358 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- hgrepos: -357 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44953/Doc_library_ctypes_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44954/Doc_library_ctypes_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44955/other_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44956/other_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44957/other_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44958/other_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: @Treyy: I have uploaded patches according to your comment at Core mentorship here (https://mail.python.org/mailman/private/core-mentorship/2016-October/003662....) `Since I applied the patch, I can say in in this particular case, re-open, preferably with one or more patches. I intended to include all changes needed, at least for .rst files, and grepped with IDLE's re-based grep, but missed most of what you listed. I probably started in the wrong directory. But exclude 1. the .rej files, which are not tracked, and which you should delete. 2. the old 'What's New' files, where 'in ?' is likely correct. 3. the includes/text/py files, for reasons given in the issue. 4. the other .py files, like test_generators.py, at least initially, until it is determined why they are not failing if incorrect. Left are *.rst. At least some of the code should be run to verify that the proposed changes are correct. I would not mind a separate patch for ctypes.rst, which has half the hits. If you only reopen and do not do a patch, please copy these comments into the issue.` Please change the status of issue to `open` from `close`. Thanks! ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Terry J. Reedy <tjreedy@udel.edu>: ---------- status: closed -> open _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Terry J. Reedy added the comment: Jaysinh, unless a patch for 3.5 does not cleanly apply to 3.6, or the patch must be different in 3.6*, no 3.6 patch is needed. Ditto for 3.7/default. Mariatta's patch merged forward without problem. *In this case, 'must be different' would be because there are different code examples. The same is true for 2.7 if the 3.x patch applies cleanly there (though this is less common there). Mariatta's patch also applied to 2.7, though as I reported, I found one more change for 2.7. So when you revise in response to comments, one of each patch is enough unless you know more are needed, in which case say so. If there are problems forward-merging the other_rst patch, please report first before preparing a 3.6 patch. If there were a problem with just one of the files, I would prpbably want a 3.6 patch just for the one file. I discovered a deeper problem. In spite of the doctest annotations, the doctests is not run on the ctypes doc and at least one of the tracebacks is wrong.
whereas, on Win10, 3.5
However, when I ran make doctest, these did not show up, but they were not run. I will worry about this as a separate issue.
---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44970/all_rst_patch_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Added file: http://bugs.python.org/file44971/v_2_7_conflict_files.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44951/Doc_library_ctypes_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44952/Doc_library_ctypes_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44953/Doc_library_ctypes_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44954/Doc_library_ctypes_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44955/other_rst_default.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44956/other_rst_version_2_7.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44957/other_rst_version_3_5.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: Removed file: http://bugs.python.org/file44958/other_rst_version_3_6.diff _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: Hello Terry, According to your instructions I had uploaded two patch files. The file named `all_rst_patch_default.diff` is applicable for version `default`, `3.5`, `3.6` and for most files of `2.7`. The file named `v_2_7_conflict_files.diff` is a correct patch of all rejected files. I have unlinked previous patch files. Please guide me if I had done mistake at any stage. Many Thanks! ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Hi Jaysinh, I reviewed your changes, they look good to me. I can't approve it, so it would still be good for a core dev here to take another pass. Thanks :) ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Cheryl Sabella added the comment: @Mariatta I believe you can do this now? ---------- nosy: +csabella _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: Jaysinh, are you up for preparing a PR based on you patch? Start with the master branch. Thanks. ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Jaysinh shukla added the comment: Thanks Mariatta for reminding. Please expect a Github PR from my side in next 2 days. ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Jaysinh shukla <jaysinhp@gmail.com>: ---------- pull_requests: +1480 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset 8856940cf2e82cb17db2b684cd5732fe658605ca by Mariatta (UltimateCoder) in branch 'master': bpo-28315: Improve code examples in docs (GH-1372) https://github.com/python/cpython/commit/8856940cf2e82cb17db2b684cd5732fe658... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- stage: resolved -> backport needed _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Terry J. Reedy added the comment: Mariatta, please continue with this and assign to yourself. I now have IDLE PRs to review and apply. ---------- assignee: terry.reedy -> _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: For sure :) Thanks Terry. ---------- assignee: -> Mariatta _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- pull_requests: +1543 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- pull_requests: +1544 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset 5274faf5e360f74690ffb735e919cdba5fdbdf1c by Mariatta in branch '3.5': [3.5] bpo-28315: Improve code examples in docs (GH-1372) (#1446) https://github.com/python/cpython/commit/5274faf5e360f74690ffb735e919cdba5fd... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset af71364c3f0e9cd6cb9d83194315af0ee3c783d2 by Mariatta in branch '3.6': [3.6] bpo-28315: Improve code examples in docs (GH-1372) (#1445) https://github.com/python/cpython/commit/af71364c3f0e9cd6cb9d83194315af0ee3c... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Changes by Mariatta Wijaya <mariatta.wijaya@gmail.com>: ---------- pull_requests: +1545 _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: New changeset e1b02ff58883c68d3a5e549aa33c6dd94f915bd6 by Mariatta in branch '2.7': [2.7] bpo-28315: Improve code examples in docs (GH-1372) (#1447) https://github.com/python/cpython/commit/e1b02ff58883c68d3a5e549aa33c6dd94f9... ---------- _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________

Mariatta Wijaya added the comment: We can finally close this. Thanks everyone :) ---------- stage: backport needed -> resolved status: open -> closed _______________________________________ Python tracker <report@bugs.python.org> <http://bugs.python.org/issue28315> _______________________________________
participants (5)
-
Cheryl Sabella
-
Jaysinh shukla
-
Mariatta Wijaya
-
Terry J. Reedy
-
Viorel Tabara