Skip to content

Conversation

@csabella
Copy link
Contributor

@csabella csabella commented Aug 19, 2017

The first commits I made for this had a difficult diff, so I added the ConfigDialog functions back in, but commented them out. The diff still isn't great, but it's better than it was. I'll remove those lines in a third PR.

I tried to fix it with the second commit by adding back in the deleted load_configs, but that didn't help.

https://bugs.python.org/issue31206

Copy link
Member

@terryjreedy terryjreedy left a comment

Choose a reason for hiding this comment

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

Since the (unnecessary) commenting out of old code caused git diff to make a mess, I removed the #s. The diff is now relatively simple and coherent.

@terryjreedy terryjreedy merged commit 8f7a798 into python:master Aug 20, 2017
@csabella csabella deleted the bpo31206 branch August 20, 2017 09:39
csabella added a commit to csabella/cpython that referenced this pull request Aug 20, 2017
…nGH-3156)

Patch 2 of 3, to avoid horrendous diff.  Create highlights page from new HighPage class instead of old ConfigDialog methods and change tests to match.
(cherry picked from commit 8f7a798)
@bedevere-bot
Copy link

GH-3159 is a backport of this pull request to the 3.6 branch.

terryjreedy pushed a commit that referenced this pull request Aug 20, 2017
…) (#3159)

Patch 2 of 3, to avoid horrendous diff.  Create highlights page from new HighPage class instead of old ConfigDialog methods and change tests to match. Patch by Cheryl Sabella.
(cherry picked from commit 8f7a798)
GadgetSteve pushed a commit to GadgetSteve/cpython that referenced this pull request Sep 10, 2017
Patch 2 of 3, to avoid horrendous diff.  Create highlights page from new HighPage class instead of old ConfigDialog methods and change tests to match.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants