8000 [3.6] bpo-30290: IDLE - pep8 names and tests for help-about by terryjreedy · Pull Request #2068 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.6] bpo-30290: IDLE - pep8 names and tests for help-about #2068

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
Closed
wants to merge 4 commits into from
Closed

[3.6] bpo-30290: IDLE - pep8 names and tests for help-about #2068

wants to merge 4 commits into from

Conversation

terryjreedy
Copy link
Member

054e091 (GH 1697)
5a346d5 (GH 1714)
eca7da0 (GH 1838)

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@Mariatta
Copy link
Member

I think you need to change the base branch to 3.6 instead of master

@terryjreedy terryjreedy mentioned this pull request Jun 10, 2017
Closed
@Mariatta Mariatta reopened this Jun 10, 2017
@Mariatta Mariatta changed the base branch from master to 3.6 June 10, 2017 05:45
@Mariatta
Copy link
Member

@terryjreedy I re-opened your PR, and changed the base branch to 3.6 instead of master.

@terryjreedy
Copy link
Member Author

This attempt to cherry pick the 3 PRs for bpo-30290 somehow went horribly wrong. So is the failure to find my CLA ;-). The conflicts are artifacts, as is the number of files changed. I have no idea how to make the conflicts disappear. When I click on files changed, the actual diff for two idlelib files looks correct. I am going to try again in my 3.6 worktree with only git commands.

@terryjreedy
Copy link
Member Author

#2070 is a clean PR with the same diff.
This time I selected 3.6 as the base.

@terryjreedy terryjreedy deleted the backport-054e091-3.6 branch June 10, 2017 06:33
@terryjreedy terryjreedy mentioned this pull request Jul 25, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@terryjreedy @the-knights-who-say-ni @Mariatta @mlouielu @csabella
0