gh-108303: Move all pydoc related files to test_pydoc

[sobolevn]

I hope that this will be one of the latest commits to this issue! 🎉
There are only a couple of things left to do. Most files were cleaned up.

The change itself is rather simple.

• Issue: Move test files into test subdirectories #108303

[sobolevn]

Very strange, why windows build fails. I will investigate.

[vstinner]

Very strange, why windows build fails. I will investigate.

Tell me if you need help to investigate.

[vstinner]

test_pydoc is failing!

[sobolevn]

yes, this is expected. I am still debugging :(
No idea what's wrong.

[sobolevn]

I will convert to draft, so it will be clear that this is a WIP.

[vstinner]

No idea what's wrong.

Try: git mv Lib/test/pydoc_mod.py Lib/test/test_pydoc/. Does it help?

[vstinner]

Also, there are now merge conflicts.

[sobolevn]

Try: git mv Lib/test/pydoc_mod.py Lib/test/test_pydoc/. Does it help?

No, that's not the case :)

I am trying to debug the initial Windows failure:

 ====================================================================== FAIL: test_text_doc (test.test_pydoc.test_pydoc.PydocDocTest.test_text_doc) ---------------------------------------------------------------------- Traceback (most recent call last): File "D:\a\cpython\cpython\Lib\test\test_pydoc\test_pydoc.py", line 435, in test_text_doc self.assertEqual(expected_text, result) ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^ AssertionError: "NAME[76 chars]DULE DOCS\n https://docs.python.org/3.13/li[2235 chars]d.py" != "NAME[76 chars]DULE REFERENCE\n https://docs.python.org/3.[2567 chars]d.py" NAME test.test_pydoc.pydoc_mod - This is a test module for test_pydoc - MODULE DOCS + MODULE REFERENCE https://docs.python.org/3.13/library/test.test_pydoc.pydoc_mod.html + + The following documentation is automatically generated from the Python + source files. It may be incomplete, incorrect or include features that + are considered implementation detail and may vary between Python + implementations. When in doubt, consult the module reference at the + location listed above. 

The problem is that I cannot reproduce it locally on my macos.

[vstinner]

You should update pydoc as well:

diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 17f7346e5c..6d145abda9 100755 --- a/Lib/pydoc.py+++ b/Lib/pydoc.py@@ -552,7 +552,7 @@ def getdocloc(self, object, basedir=sysconfig.get_path('stdlib')): '_thread', 'zipimport') or (file.startswith(basedir) and not file.startswith(os.path.join(basedir, 'site-packages')))) and - object.__name__ not in ('xml.etree', 'test.pydoc_mod')):+ object.__name__ not in ('xml.etree', 'test.test_pydoc.pydoc_mod')): if docloc.startswith(("http://", "https://")): docloc = "{}/{}.html".format(docloc.rstrip("/"), object.__name__.lower()) else: 

[sobolevn]

@vstinner thanks a lot, your suggestion about object.__name__ not in ('xml.etree', 'test.test_pydoc.pydoc_mod') worked!
Not gonna lie, I still do not fully understand the difference between macos / linux / win pydoc builds, but since all CIs are green now, I think that it is fine :)

[miss-islington-app]

Thanks @sobolevn for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

[miss-islington-app]

Sorry, @sobolevn and @vstinner, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker ccc76c3e88647e416184bb1f5210b4e8946ae358 3.12 

[miss-islington-app]

Sorry, @sobolevn and @vstinner, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker ccc76c3e88647e416184bb1f5210b4e8946ae358 3.11 

[vstinner]

Merged. I just edited the commit message. Oh, sorry, I forgot that you can now merge changes by yourself! Oops.

Well, sadly, automated backports fail as usual. Can you try to backport them manually?

[sobolevn]

Will do!

[bedevere-app]

GH-115501 is a backport of this pull request to the 3.11 branch.

[bedevere-app]

GH-115502 is a backport of this pull request to the 3.12 branch.