Skip to content
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

gh-102507 Remove invisible pagebreak characters #102531

Merged
merged 6 commits into from
Mar 8, 2023
Merged

gh-102507 Remove invisible pagebreak characters #102531

merged 6 commits into from
Mar 8, 2023

Conversation

JosephSBoyle
Copy link
Contributor

@JosephSBoyle JosephSBoyle commented Mar 8, 2023 •
edited by bedevere-bot
Loading

Removes invisible pagebreak chars from the repository.

These chars are not visible in the gh-diff, but code editors should display them. For instance VSCode displays it as this strange red box:

image

@JosephSBoyle JosephSBoyle requested a review from a team as a code owner March 8, 2023 11:13
@bedevere-bot bedevere-bot mentioned this pull request Mar 8, 2023
Closed
@JosephSBoyle JosephSBoyle marked this pull request as draft March 8, 2023 11:16
@JosephSBoyle JosephSBoyle force-pushed the fix-issue-102507 branch 2 times, most recently from c1a6775 to a236e91 Compare March 8, 2023 11:26
@JosephSBoyle JosephSBoyle reopened this Mar 8, 2023
JosephSBoyle
JosephSBoyle commented Mar 8, 2023
View reviewed changes
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
JosephSBoyle
JosephSBoyle commented Mar 8, 2023
View reviewed changes
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
@JosephSBoyle JosephSBoyle marked this pull request as ready for review March 8, 2023 11:43
AlexWaygood
AlexWaygood reviewed Mar 8, 2023
View reviewed changes
Lib/email/generator.py Show resolved Hide resolved
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
Tools/i18n/pygettext.py Show resolved Hide resolved
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
Tools/i18n/pygettext.py Show resolved Hide resolved
Tools/i18n/pygettext.py Show resolved Hide resolved
@AlexWaygood
Copy link
Member

FYI we much prefer merge commits over rebases in the CPython repo, where possible. Rebases (well, force-pushes in general) interact quite badly with the GitHub UI, making it quite hard to see what changed in between commits and making incremental review quite difficult. Everything's squash-merged in the end anyway, so a messy git history on a PR is usually nothing to worry about!

@JosephSBoyle
Copy link
Contributor Author

FYI we much prefer merge commits over rebases in the CPython repo, where possible. Rebases (well, force-pushes in general) interact quite badly with the GitHub UI, making it quite hard to see what changed in between commits and making incremental review quite difficult. Everything's squash-merged in the end anyway, so a messy git history on a PR is usually nothing to worry about!

Aha, that makes sense. Thanks for the headsup @AlexWaygood 🙇

AlexWaygood
AlexWaygood approved these changes Mar 8, 2023
View reviewed changes
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

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

Thanks!

@AlexWaygood AlexWaygood linked an issue Mar 8, 2023 that may be closed by this pull request
Remove invisible pagebreak chars from the standard library #102507
Closed
@sobolevn
Copy link
Member

sobolevn commented Mar 8, 2023

I once saw a similar PR that was rejected :(
But, I cannot remember by who and why

@AlexWaygood
Copy link
Member

AlexWaygood commented Mar 8, 2023 •
edited
Loading

I once saw a similar PR that was rejected :( But, I cannot remember by who and why

It was rejected because Guido said we should do it all at once if we wanted to do it, rather than doing it just in one file. And that's exactly what @JosephSBoyle has done here :)

@AlexWaygood AlexWaygood merged commit b097925 into python:main Mar 8, 2023
carljm added a commit to carljm/cpython that referenced this pull request Mar 8, 2023
@carljm
Merge branch 'main' into inlinecomp2
06db319 
* main:
  pythongh-102304: Consolidate Direct Usage of _Py_RefTotal (pythongh-102514)
  pythongh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives (in Objects/) (python#102218)
  pythongh-102507 Remove invisible pagebreak characters (python#102531)
  pythongh-102515: Remove unused imports in the `Lib/` directory (python#102516)
  Remove or update bitbucket links (pythonGH-101963)
  pythongh-101100: Fix sphinx warnings in `zipapp` and `zipfile` modules (python#102526)
  pythonGH-102397: Fix segfault from race condition in signal handling (python#102399)
  Fix style in argparse.rst (python#101733)
  Post 3.12.0a6
  fix typo in async generator code field name `ag_code` (python#102448)
  Python 3.12.0a6
@hugovk hugovk mentioned this pull request May 7, 2023
Merged
@AlexWaygood AlexWaygood mentioned this pull request Aug 22, 2023
Merged
@hugovk hugovk added the needs backport to 3.11 only security fixes label Aug 22, 2023
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Aug 22, 2023
@JosephSBoyle @AlexWaygood @miss-islington
pythongh-102507 Remove invisible pagebreak characters (pythonGH-102531)
61d3a8a 
(cherry picked from commit b097925)

Co-authored-by: JosephSBoyle <48555120+JosephSBoyle@users.noreply.github.com>
Co-authored-by: AlexWaygood <alex.waygood@gmail.com>
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Aug 22, 2023
AlexWaygood added a commit that referenced this pull request Aug 22, 2023
@miss-islington @JosephSBoyle @AlexWaygood
[3.11] gh-102507 Remove invisible pagebreak characters (GH-102531) (#…
dd0a1f9 
…108266)

gh-102507 Remove invisible pagebreak characters (GH-102531)
(cherry picked from commit b097925)

Co-authored-by: JosephSBoyle <48555120+JosephSBoyle@users.noreply.github.com>
Co-authored-by: AlexWaygood <alex.waygood@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexWaygood AlexWaygood AlexWaygood approved these changes

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove invisible pagebreak chars from the standard library
6 participants
@JosephSBoyle @AlexWaygood @sobolevn @miss-islington @bedevere-bot @hugovk