8000 DOC Remove some str/unicode leftovers from Python 2 by DimitriPapadopoulos · Pull Request #21270 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]

Skip to content

DOC Remove some str/unicode leftovers from Python 2 #21270

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.

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

Merged
merged 5 commits into from
Oct 8, 2021

Conversation

DimitriPapadopoulos
Copy link
Contributor
  • stringstr (when meant as Python 2 str or unicode and not bytes)
  • unicodestr and strbytes (when meant as Python 2 types)
  • strbytes or str (when primarily meant for bytes and no-op for str)

* string → str (when meant as Python 2 `str` or `unicode` and not `bytes`)
* unicode → str and str → bytes (when meant as Python 2 types)
* str →  bytes or str (when primarily meant for `bytes` and no-op for `str`)
Copy link
Member
@ogrisel ogrisel left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the clean-up!

Copy link
Member
@thomasjpfan thomasjpfan left a comment

Choose a reason for hiding this comment

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

Thank you for the PR @DimitriPapadopoulos !

Most comments are to be consistent with other docstrings.

DimitriPapadopoulos and others added 4 commits October 7, 2021 23:22
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
Copy link
Member
@jjerphan jjerphan left a comment

Choose a reason for hiding this comment

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

LGTM, thank you @DimitriPapadopoulos for making those doc-strings uniform.

@rth
Copy link
Member
rth commented Oct 8, 2021

Thanks @DimitriPapadopoulos!

@rth rth merged commit 10a5468 into scikit-learn:main Oct 8, 2021
@DimitriPapadopoulos DimitriPapadopoulos deleted the str_unicode branch October 8, 2021 12:06
jjerphan pushed a commit to jjerphan/scikit-learn that referenced this pull request Oct 8, 2021
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
@glemaitre glemaitre mentioned this pull request Oct 23, 2021
10 tasks
glemaitre pushed a commit to glemaitre/scikit-learn that referenced this pull request Oct 23, 2021
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
glemaitre pushed a commit that referenced this pull request Oct 25, 2021
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
samronsin pushed a commit to samronsin/scikit-learn that referenced this pull request Nov 30, 2021
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
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
0