[3.12] gh-90300: Reformat the Python CLI help output (GH-93415) by ambv · Pull Request #115847 · python/cpython · GitHub

(cherry picked from commit 2e92ffd)

Issue: python --help output is too long #90300

…93415) (cherry picked from commit 2e92ffd) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

…thought.

@serhiy-storchaka if you can take a quick look that there's nothing obvious broken here, that'd be nice. I took care to remove options that don't exist on 3.12 and match the rest of the newlines per the original PR.

Thanks @ambv for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

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

cherry_picker 2bdd1d6f15d5507a9ed6dff10e9fb57e2a8c0b40 3.11

Yup, I'll solve this conflict, too :)

…93415) (python#115847) (cherry picked from commit 2e92ffd) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> (cherry picked from commit 2bdd1d6)

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

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

…116418) (cherry picked from commit 2e92ffd) (cherry picked from commit 2bdd1d6) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

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

Hi! The buildbot AMD64 Debian PGO 3.11 has failed when building commit e8fb762.

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/1024/builds/1578) and take a look at the build logs.
Check if the failure is related to this commit (e8fb762) 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/1024/builds/1578

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

==

Click to see traceback logs

remote: Enumerating objects: 7, done.        
remote: Counting objects:  14% (1/7)        
remote: Counting objects:  28% (2/7)        
remote: Counting objects:  42% (3/7)        
remote: Counting objects:  57% (4/7)        
remote: Counting objects:  71% (5/7)        
remote: Counting objects:  85% (6/7)        
remote: Counting objects: 100% (7/7)        
remote: Counting objects: 100% (7/7), done.        
remote: Compressing objects:  50% (1/2)        
remote: Compressing objects: 100% (2/2)        
remote: Compressing objects: 100% (2/2), done.        
remote: Total 4 (delta 3), reused 2 (delta 2), pack-reused 0        
From https://github.com/python/cpython
 * branch                  3.11       -> FETCH_HEAD
Note: switching to 'e8fb762fa9bcca25a857fc416221ca752ad09f42'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at e8fb762fa9 [3.11] gh-90300: Reformat the Python CLI help output (GH-115847) (GH-116418)
Switched to and reset branch '3.11'

find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
make[2]: [Makefile:2607: clean-retain-profile] Error 1 (ignored)
renaming build/scripts-3.11/pydoc3 to build/scripts-3.11/pydoc3.11
renaming build/scripts-3.11/idle3 to build/scripts-3.11/idle3.11
renaming build/scripts-3.11/2to3 to build/scripts-3.11/2to3-3.11
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘doParseXmlDecl’ at ./Modules/expat/xmltok.c:1192:13:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘doParseXmlDecl’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1070:9:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1076:12:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1076:12:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1083:9:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1083:9:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1110:7:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1123:9:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
In function ‘utf8_toUtf8’,
    inlined from ‘toAscii’ at ./Modules/expat/xmltok.c:1038:3,
    inlined from ‘parsePseudoAttribute’ at ./Modules/expat/xmltok.c:1123:9:
./Modules/expat/xmltok.c:392:5: warning: ‘memcpy’ writing 2 or more bytes into a region of size 1 overflows the destination [-Wstringop-overflow=]
  392 |     memcpy(*toP, *fromP, bytesToCopy);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./Modules/expat/xmltok.c: In function ‘parsePseudoAttribute’:
./Modules/expat/xmltok.c:1036:8: note: destination object ‘buf’ of size 1
 1036 |   char buf[1];
      |        ^~~
renaming build/scripts-3.11/pydoc3 to build/scripts-3.11/pydoc3.11
renaming build/scripts-3.11/idle3 to build/scripts-3.11/idle3.11
renaming build/scripts-3.11/2to3 to build/scripts-3.11/2to3-3.11

renaming build/scripts-3.11/pydoc3 to build/scripts-3.11/pydoc3.11
renaming build/scripts-3.11/idle3 to build/scripts-3.11/idle3.11
renaming build/scripts-3.11/2to3 to build/scripts-3.11/2to3-3.11

renaming build/scripts-3.11/pydoc3 to build/scripts-3.11/pydoc3.11
renaming build/scripts-3.11/idle3 to build/scripts-3.11/idle3.11
renaming build/scripts-3.11/2to3 to build/scripts-3.11/2to3-3.11
make: *** [Makefile:1852: buildbottest] Error 3

[3.12] pythongh-90300 : Reformat the Python CLI help output (pythonGH-…

6458a33

…93415) (cherry picked from commit 2e92ffd) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

bedevere-app Bot added the awaiting core review label Feb 23, 2024

bedevere-app Bot mentioned this pull request Feb 23, 2024

gh-90300: Reformat the Python CLI help output #93415

Merged

bedevere-app Bot added the skip news label Feb 23, 2024

bedevere-app Bot mentioned this pull request Feb 23, 2024

python --help output is too long #90300

Closed

ambv added the needs backport to 3.11 only security fixes label Feb 23, 2024

Turns out you have to close string literals you open. Who would have …

c260637

…thought.

ambv requested a review from serhiy-storchaka February 23, 2024 10:36

serhiy-storchaka reviewed Feb 23, 2024

View reviewed changes

Comment thread Python/initconfig.c Outdated

Update Python/initconfig.c

e836b61

serhiy-storchaka approved these changes Feb 23, 2024

View reviewed changes

bedevere-app Bot added awaiting merge and removed awaiting core review labels Feb 23, 2024

ambv merged commit 2bdd1d6 into python:3.12 Feb 23, 2024

bedevere-app Bot removed the awaiting merge label Feb 23, 2024

ambv deleted the backport-2e92ffd-3.12 branch February 23, 2024 17:23

miss-islington-app Bot assigned ambv Feb 23, 2024

bedevere-app Bot removed the needs backport to 3.11 only security fixes label Mar 6, 2024

ambv added a commit that referenced this pull request Mar 6, 2024

[3.11] gh-90300 : Reformat the Python CLI help output (GH-115847 ) (GH-…

e8fb762

…116418) (cherry picked from commit 2e92ffd) (cherry picked from commit 2bdd1d6) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415) by ambv · Pull Request #115847 · python/cpython · GitHub

Repository navigation

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415) - #115847

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415)#115847
ambv merged 3 commits into
python:3.12from
ambv:backport-2e92ffd-3.12

ambv commented Feb 23, 2024 •
edited by bedevere-app Bot
Loading

Uh oh!

Uh oh!

ambv commented Feb 23, 2024

Uh oh!

Uh oh!

miss-islington-app Bot commented Feb 23, 2024

Uh oh!

miss-islington-app Bot commented Feb 23, 2024

Uh oh!

ambv commented Feb 23, 2024

Uh oh!

bedevere-app Bot commented Mar 6, 2024

Uh oh!

bedevere-app Bot commented Mar 6, 2024

Uh oh!

bedevere-bot commented Mar 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415) by ambv · Pull Request #115847 · python/cpython · GitHub

Repository navigation

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415) - #115847

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415)#115847ambv merged 3 commits intopython:3.12python/cpython:3.12from ambv:backport-2e92ffd-3.12ambv/cpython:backport-2e92ffd-3.12Copy head branch name to clipboard

Conversation

ambv commented Feb 23, 2024 • edited by bedevere-app Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ambv commented Feb 23, 2024

Uh oh!

Uh oh!

miss-islington-app Bot commented Feb 23, 2024

Uh oh!

miss-islington-app Bot commented Feb 23, 2024

Uh oh!

ambv commented Feb 23, 2024

Uh oh!

bedevere-app Bot commented Mar 6, 2024

Uh oh!

bedevere-app Bot commented Mar 6, 2024

Uh oh!

bedevere-bot commented Mar 6, 2024

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

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[3.12] gh-90300: Reformat the Python CLI help output (GH-93415)#115847
ambv merged 3 commits into
python:3.12from
ambv:backport-2e92ffd-3.12

ambv commented Feb 23, 2024 •
edited by bedevere-app Bot
Loading