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.

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

Pyupgrade #3185

Merged
merged 1 commit into from
Sep 29, 2020
Merged

Pyupgrade #3185

merged 1 commit into from
Sep 29, 2020

Conversation

jensens
Copy link
Member

@jensens jensens commented Sep 26, 2020

Applied find . -name "*.py" |grep -v skins|xargs pyupgrade --py36-plus --py3-only.
Lets see what Jenkins says.

@pbauer
Copy link
Member

pbauer commented Sep 26, 2020

--py3-only is obsolete here. --py36-plus is enough and will give us f-strings :)

@mauritsvanrees
Copy link
Member

I would also say use --py36-plus. Let's have all changes in one commit.

@jensens
Copy link
Member Author

jensens commented Sep 28, 2020

Doesn't --py36-plus implies --py3-only already?

@mauritsvanrees
Copy link
Member

--py36-plus implies --py3-only, but not the other way around.

@jensens
Copy link
Member Author

jensens commented Sep 28, 2020

to merge or not to merge, that's here the question....

@pbauer
Copy link
Member

pbauer commented Sep 28, 2020

I'm generally +1 but I want it with f-strings. When I run the command find . -name "*.py" |grep -v skins|xargs pyupgrade --py36-plus I get at least some some f-strings, e.g. in https://github.com/plone/Products.CMFPlone/pull/3185/files#diff-1582a68636fd8187555ca419b38fce6cL306 your result is '{}/{}'.format(category, id) whereas mine is f'{category}/{id}', which I prefer.
Can you please do again the same without --py3-only?

@jensens jensens force-pushed the pyupgrade-3.6+ branch 2 times, most recently from 2978b43 to fe25145 Compare September 28, 2020 15:10
@jensens
Copy link
Member Author

jensens commented Sep 28, 2020

@jenkins-plone-org please run jobs

@jensens jensens merged commit 2694f01 into master Sep 29, 2020
@jensens jensens deleted the pyupgrade-3.6+ branch September 29, 2020 23:20
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.

3 participants