8000 Fix non-matching bracket pairs by mohamadmansourX · Pull Request #28473 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

Fix non-matching bracket pairs #28473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
Sep 21, 2021
Merged

Fix non-matching bracket pairs #28473

merged 13 commits into from
Sep 21, 2021

Conversation

mohamadmansourX
Copy link
Contributor
@mohamadmansourX mohamadmansourX commented Sep 20, 2021 •
edited by terryjreedy
Loading

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

terryjreedy
terryjreedy requested changes Sep 20, 2021
View reviewed changes
Copy link
Member
@terryjreedy terryjreedy left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Tools/stringbench/stringbench.py
10000
@@ -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)',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@bedevere-bot
Copy link

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.

mohamadmansourX and others added 7 commits September 20, 2021 17:16
@mohamadmansourX @terryjreedy
Update Doc/library/urllib.request.rst
ab7b8da 
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@mohamadmansourX @terryjreedy
Update Lib/distutils/msvc9compiler.py
a33362e 
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@mohamadmansourX @terryjreedy
Update Lib/idlelib/idle_test/test_query.py
2f0c301 
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@mohamadmansourX @terryjreedy
Update Lib/test/support/__init__.py
173e67e 
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@mohamadmansourX @terryjreedy
Update Lib/test/test_winreg.py
3204e0c 
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@mohamadmansourX @terryjreedy
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>
@mohamadmansourX @terryjreedy
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 terryjreedy added skip issue skip news docs Documentation in the Doc dir labels Sep 20, 2021
@terryjreedy
Copy link
Member

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
serhiy-storchaka reviewed Sep 20, 2021
View reviewed changes
Copy link
Member
@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@serhiy-storchaka serhiy-storchaka added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Sep 20, 2021
@terryjreedy
Copy link
Member

@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
terryjreedy reviewed Sep 20, 2021
View reviewed changes
Doc/library/pathlib.rst Outdated
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@ambv ambv changed the title Fixing some Syntax Fix non-matching bracket pairs Sep 21, 2021
ambv and others added 3 commits September 22, 2021 00:11
@ambv ambv merged commit 8f943ca into python:main Sep 21, 2021
@miss-islington
Copy link
Contributor

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
Copy link
Contributor

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
Copy link
Contributor

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

ambv pushed a commit to ambv/cpython that referenced this pull request Sep 21, 2021
@mohamadmansourX @ambv
[3.10] [codemod] Fix non-matching bracket pairs (pythonGH-28473)
d9faa0d 
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
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Sep 21, 2021
ambv added a commit that referenced this pull request Sep 21, 2021
@ambv @mohamadmansourX
[3.10] [codemod] Fix non-matching bracket pairs (GH-28473) (GH-28511)
8c1e1da 
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>
ambv pushed a commit to ambv/cpython that referenced this pull request Sep 21, 2021
@mohamadmansourX @ambv
[3.9] [codemod] Fix non-matching bracket pairs (pythonGH-28473)
6d891e2 
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 bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 21, 2021
@bedevere-bot
Copy link

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

@bedevere-bot
Copy link

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

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

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. 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.
  4. Check if the failure is related to this commit (8f943ca) or if it is a false positive.
  5. 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']

ambv added a commit that referenced this pull request Sep 22, 2021
@ambv @mohamadmansourX
[3.9] [codemod] Fix non-matching bracket pairs (GH-28473) (GH-28512)
5482db5 
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>
pablogsal pushed a commit that referenced this pull request Sep 29, 2021
@ambv @mohamadmansourX @pablogsal
[3.10] [codemod] Fix non-matching bracket pairs (GH-28473) (GH-28511)
b09a68a 
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ambv ambv ambv left review comments

@serhiy-storchaka serhiy-storchaka serhiy-storchaka left review comments

@terryjreedy terryjreedy terryjreedy requested changes

@abalkin abalkin Awaiting requested review from abalkin abalkin is a code owner

@ethanfurman ethanfurman Awaiting requested review from ethanfurman ethanfurman is a code owner

@pganssle pganssle Awaiting requested review from pganssle pganssle is a code owner

@vsajip vsajip Awaiting requested review from vsajip vsajip is a code owner

Assignees

@ambv ambv

Labels
docs Documentation in the Doc dir skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mohamadmansourX @bedevere-bot @terryjreedy @miss-islington @ambv @serhiy-storchaka @the-knights-who-say-ni
0