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

PR: Truncate results correctly in Find in Files for Python 2 #7812

Merged
merged 3 commits into from
Sep 3, 2018
Merged

PR: Truncate results correctly in Find in Files for Python 2 #7812

merged 3 commits into from
Sep 3, 2018

Conversation

jfunez
Copy link
Contributor

@jfunez jfunez commented Sep 1, 2018 •
edited by ccordoba12
Loading

Pull Request Checklist

  • Read and followed this repo's Contributing Guidelines
  • Based your PR on the latest version of the correct branch (master or 3.x)
  • Followed PEP8 for code style
  • Ensured your pull request hasn't eliminated unrelated blank lines/spaces,
    modified the spyder/defaults directory, or added new icons/assets
  • Wrote at least one-line docstrings for any new functions
  • Added at least one unit test covering the changes, if at all possible
  • Described your changes and the motivation for them below
  • Noted what issue(s) this pull request resolves, creating one if needed
  • Included a screenshot, if this PR makes any visible changes to the UI

Description of Changes

Issue(s) Resolved

Fixes #6218

@ccordoba12 ccordoba12 added this to the v3.3.2 milestone Sep 3, 2018
ccordoba12
ccordoba12 approved these changes Sep 3, 2018
View reviewed changes
Copy link
Member

@ccordoba12 ccordoba12 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.

Thanks a lot @jfunez!

I did a minor change to your test to really test that truncate_result is transforming bytes to unicode in Python 2.

@ccordoba12 ccordoba12 changed the title Issue 6218 PR: Truncate results correctly in Find in Files for Python 2 Sep 3, 2018
@jfunez
Copy link
Contributor Author

jfunez commented Sep 3, 2018

👍 excellent!

@ccordoba12 ccordoba12 merged commit 0c86264 into spyder-ide:3.x Sep 3, 2018
ccordoba12 added a commit that referenced this pull request Sep 3, 2018
@ccordoba12
Merge from 3.x: PR #7812
c8898fe 
Fixes #6218
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ccordoba12 ccordoba12 ccordoba12 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.3.2
Development

Successfully merging this pull request may close these issues.
2 participants
@jfunez @ccordoba12