Apply pyupgrade and refurb suggestions #352

DimitriPapadopoulos · 2022-12-16T22:00:09Z

No description provided.

effigies · 2022-12-16T22:15:36Z

src/header.py

@@ -1,4 +1,3 @@
-


This whitespace is significant.

That's what I suspected, but it's not clear why. Is additional code added in front of it?

Yes, these files are compiled into the single-file versioneer.py file.

The alternative would be to add the extra line when compiling the versioneer.py file in setup.py. But then, why change something that works?

Fixed, but I still need to look into the files under test.

src/render.py

src/setupfunc.py

effigies

All seems fine. Some small suggestions, but I'm okay to merge as-is.

effigies · 2022-12-17T14:27:04Z

src/from_file.py

+        f.write(SHORT_VERSION_PY.format(contents))

-    print("set %s to '%s'" % (filename, versions["version"]))
+    print("set {} to '{}'".format(filename, versions["version"]))


Might as well use an f-string if we're here.

Suggested change

print("set {} to '{}'".format(filename, versions["version"]))

print(f"set {filename} to {versions['version']:r}")

But then we're modifying functionality, by changing '%s' to {...} instead of '{...}', aren't we?

Also, I suspect you meant !r instead of :r. It will call repr(), but then how is that helpful?

>>> i = 2 >>> >>> f"We print 'i' as '{i}'" "We print 'i' as '2'" >>> >>> f"We print 'i' as {i!r}" "We print 'i' as 2" >>>

We might use triple quotes instead:

f"""set {filename} to '{versions["version"]}'"""

But then it gets unreadable.

src/from_parentdir.py

src/git/from_vcs.py

DimitriPapadopoulos · 2022-12-18T09:10:43Z

I still need to fix these flake8 errors, don't I?

  git_version.py:335:89: E501 line too long (90 > 88 characters)
  versioneer.py:809:89: E501 line too long (90 > 88 characters)
  versioneer.py:1330:89: E501 line too long (90 > 88 characters)

I believe this flake8 line length limit is complete nonsense when applied to strings, especially f-strings with longer replacement fields.

See for example what the Linux kernel coding style has to say about it:

The limit on the length of lines is 80 columns and this is a strongly preferred limit.

[...] However, never break user-visible strings such as printk messages, because that breaks the ability to grep for them.

Use f-strings wherever possible.

* [FURB109]: Replace `in [x, y, z]` with `in (x, y, z)`

effigies reviewed Dec 16, 2022

View reviewed changes

src/render.py Show resolved Hide resolved

effigies reviewed Dec 16, 2022

View reviewed changes

src/setupfunc.py Show resolved Hide resolved

DimitriPapadopoulos force-pushed the pyupgrade branch 4 times, most recently from ac8e499 to 3ba033b Compare December 17, 2022 13:59

effigies approved these changes Dec 17, 2022

View reviewed changes

DimitriPapadopoulos added 2 commits February 2, 2023 16:16

Apply pyupgrade suggestions

8dbfa8c

Use f-strings wherever possible.

Apply refurb suggestions

f3846e0

* [FURB109]: Replace `in [x, y, z]` with `in (x, y, z)`

DimitriPapadopoulos force-pushed the pyupgrade branch from a07d0fd to f3846e0 Compare February 2, 2023 15:16

	print("set {} to '{}'".format(filename, versions["version"]))
	print(f"set {filename} to {versions['version']:r}")

Apply pyupgrade and refurb suggestions #352

Are you sure you want to change the base?

Apply pyupgrade and refurb suggestions #352

Uh oh!

Conversation

DimitriPapadopoulos commented Dec 16, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

effigies left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DimitriPapadopoulos commented Dec 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

DimitriPapadopoulos commented Dec 18, 2022 •

edited

Loading