Fix non-matching bracket pairs #28473

mohamadmansourX · 2021-09-20T11:50:46Z

'Doc text' includes doc files, comments, and docstrings.

terryjreedy

I checked all changes and believe they are correct except as noted.

Test failure in regenerated file check, line 1040:

# Updating PCbuild/_freeze_module.vcxproj.filters
The Makefile was updated, you may need to re-run make.
Error in file "./Modules/arraymodule.c" on line 3125:
Checksum mismatch!
Expected: 376001addedc67ee
Computed: f130a994f98f1227
Suggested fix: remove all generated code including the end marker,
or use the '-f' option.

Does anyone else know more about this?

There was also a failure in the Pipelines test, which I cannot see since tests have been restarted. Likely the same issue, but will see after tests rerun.

Doc/library/urllib.request.rst

Lib/distutils/msvc9compiler.py

Lib/idlelib/idle_test/test_query.py

Lib/test/support/__init__.py

Lib/test/test_winreg.py

Misc/NEWS.d/next/Build/2021-09-09-16-45-26.bpo-45067.mFmY92.rst

terryjreedy · 2021-09-20T14:14:28Z

Tools/stringbench/stringbench.py

@@ -730,7 +730,7 @@ def join_alphabet_list_five(STR):
    for x in _RANGE_1000:
        sep_join(s2)

-@bench('"A".join(["Bob"]*100))',
+@bench('"A".join(["Bob"]*100)',


Line 742 below needs the same correction.

I considered whether the 'mistake' might be intentional and checked the definition of bench. The first argument is attached to the function f as f.comment. So the error has no possible functional use and should be corrected.

Modules/clinic/arraymodule.c.h

bedevere-bot · 2021-09-20T14:14:31Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

terryjreedy · 2021-09-20T14:22:23Z

You should make PRs from PR branches derived from main. See the devguide, That will allow you to work on more than one independent change at a time.

serhiy-storchaka

👍

Doc/library/pathlib.rst

Include/cpython/unicodeobject.h

terryjreedy · 2021-09-20T18:07:56Z

@zooba Do you know what is going on with Azure Pipelines? 'Details' leads to
https://dev.azure.com/Python/cpython/_build/results?buildId=88167&view=results
which has no failure indication other than maybe running for 1 sec.
Clicking around a bit got me to this page
https://dev.azure.com/Python/cpython/_build/results?buildId=88168&view=results
(88168 instead of 88167) showing all skipped or passing.

terryjreedy · 2021-09-20T18:17:05Z

Doc/library/pathlib.rst

@@ -552,7 +552,7 @@ Pure paths provide the following methods and properties:
      Traceback (most recent call last):
        File "<stdin>", line 1, in <module>
        File "pathlib.py", line 694, in relative_to


The line # is obsolete. Could change. In 3.10/11

Suggested change

File "pathlib.py", line 694, in relative_to

File "pathlib.py", line 818, in relative_to

was 941 in 3.9 but not worth the bother to change in backport.

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

miss-islington · 2021-09-21T23:09:03Z

Thanks @mohamadmansourX for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

miss-islington · 2021-09-21T23:09:05Z

Sorry @mohamadmansourX and @ambv, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 8f943ca25732d548cf9f0b0393ba8d582fb93e29 3.10

miss-islington · 2021-09-21T23:09:08Z

Sorry, @mohamadmansourX and @ambv, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8f943ca25732d548cf9f0b0393ba8d582fb93e29 3.9

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> (cherry picked from commit 8f943ca) Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>

bedevere-bot · 2021-09-21T23:10:25Z

GH-28511 is a backport of this pull request to the 3.10 branch.

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> (cherry picked from commit 8f943ca) Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl>. (cherry picked from commit 8f943ca) Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>

bedevere-bot · 2021-09-21T23:36:32Z

GH-28512 is a backport of this pull request to the 3.9 branch.

bedevere-bot · 2021-09-22T00:50:32Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot x86-64 macOS 3.x has failed when building commit 8f943ca.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/366/builds/912) and take a look at the build logs.
Check if the failure is related to this commit (8f943ca) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/366/builds/912

Failed tests:

test_importlib

Failed subtests:

test_multiprocessing_pool_circular_import - test.test_importlib.test_threaded_import.ThreadedImportTests

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.x.billenstein-macos/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
    cache[rtype].remove(name)
    ^^^^^^^^^^^^^^^^^^^^^^^^^
KeyError: '/psm_b1ad8aba'


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.x.billenstein-macos/build/Lib/test/test_importlib/test_threaded_import.py", line 258, in test_multiprocessing_pool_circular_import
    script_helper.assert_python_ok(fn)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.billenstein-macos/build/Lib/test/support/script_helper.py", line 160, in assert_python_ok
    return _assert_python(True, *args, **env_vars)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.billenstein-macos/build/Lib/test/support/script_helper.py", line 145, in _assert_python
    res.fail(cmd_line)
    ^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.billenstein-macos/build/Lib/test/support/script_helper.py", line 72, in fail
    raise AssertionError("Process return code is %d\n"
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: Process return code is 1
command line: ['/Users/buildbot/buildarea/3.x.billenstein-macos/build/python.exe', '-X', 'faulthandler', '-I', '/Users/buildbot/buildarea/3.x.billenstein-macos/build/Lib/test/test_importlib/partial/pool_in_threads.py']

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl>. (cherry picked from commit 8f943ca) Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> (cherry picked from commit 8f943ca) Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>

mohamadmansourX and others added 2 commits Sep 20, 2021

Fixed some syntax

bcf4135

Merge branch 'python:main' into main

d08483b

mohamadmansourX requested review from abalkin, ethanfurman, pganssle, terryjreedy, vsajip and a team as code owners Sep 20, 2021

the-knights-who-say-ni added the CLA signed label Sep 20, 2021

bedevere-bot added the awaiting review label Sep 20, 2021

terryjreedy requested changes Sep 20, 2021

View changes

bedevere-bot removed the awaiting review label Sep 20, 2021

bedevere-bot added the awaiting changes label Sep 20, 2021

mohamadmansourX and others added 7 commits Sep 20, 2021

Update Doc/library/urllib.request.rst

ab7b8da

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Update Lib/distutils/msvc9compiler.py

a33362e

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Update Lib/idlelib/idle_test/test_query.py

2f0c301

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Update Lib/test/support/__init__.py

173e67e

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Update Lib/test/test_winreg.py

3204e0c

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Update Misc/NEWS.d/next/Build/2021-09-09-16-45-26.bpo-45067.mFmY92.rst

ddad1bc

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Update Misc/NEWS.d/next/Build/2021-09-09-16-45-26.bpo-45067.mFmY92.rst

1ae146f

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

terryjreedy added skip issue skip news docs Documentation in the Doc dir labels Sep 20, 2021

serhiy-storchaka reviewed Sep 20, 2021

View changes

Doc/library/pathlib.rst Outdated Show resolved Hide resolved

Include/cpython/unicodeobject.h Outdated Show resolved Hide resolved

serhiy-storchaka added needs backport to 3.9 needs backport to 3.10 labels Sep 20, 2021

terryjreedy reviewed Sep 20, 2021

View changes

Merge branch 'python:main' into main

d22be2c

ambv changed the title ~~Fixing some Syntax~~ Fix non-matching bracket pairs Sep 21, 2021

ambv and others added 3 commits Sep 21, 2021

Apply suggestions from code review

683bea4

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Run make regen-all

35f243a

Run make regen-all

dc776d3

ambv merged commit 8f943ca into python:main Sep 21, 2021
12 checks passed

bedevere-bot removed the awaiting changes label Sep 21, 2021

miss-islington assigned ambv Sep 21, 2021

bedevere-bot removed the needs backport to 3.10 label Sep 21, 2021

bedevere-bot removed the needs backport to 3.9 label Sep 21, 2021

Fix non-matching bracket pairs #28473

Fix non-matching bracket pairs #28473

mohamadmansourX commented Sep 20, 2021 •

edited by terryjreedy

terryjreedy left a comment •

edited

terryjreedy Sep 20, 2021

bedevere-bot commented Sep 20, 2021

terryjreedy commented Sep 20, 2021

serhiy-storchaka left a comment

terryjreedy commented Sep 20, 2021

terryjreedy Sep 20, 2021

miss-islington commented Sep 21, 2021

miss-islington commented Sep 21, 2021

miss-islington commented Sep 21, 2021

bedevere-bot commented Sep 21, 2021

bedevere-bot commented Sep 21, 2021

bedevere-bot commented Sep 22, 2021

	File "pathlib.py", line 694, in relative_to
	File "pathlib.py", line 818, in relative_to

Fix non-matching bracket pairs #28473

Fix non-matching bracket pairs #28473

Conversation

mohamadmansourX commented Sep 20, 2021 • edited by terryjreedy

terryjreedy left a comment • edited

terryjreedy Sep 20, 2021

Choose a reason for hiding this comment

bedevere-bot commented Sep 20, 2021

terryjreedy commented Sep 20, 2021

serhiy-storchaka left a comment

terryjreedy commented Sep 20, 2021

terryjreedy Sep 20, 2021

Choose a reason for hiding this comment

miss-islington commented Sep 21, 2021

miss-islington commented Sep 21, 2021

miss-islington commented Sep 21, 2021

bedevere-bot commented Sep 21, 2021

bedevere-bot commented Sep 21, 2021

bedevere-bot commented Sep 22, 2021

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

mohamadmansourX commented Sep 20, 2021 •

edited by terryjreedy

terryjreedy left a comment •

edited