Merge pull request #1635 from wkentaro/ruff_pyupgrade

Enable pyupgrade check in ruff

Author: wkentaro

Makefile

@@ -28,12 +28,10 @@ setup:  # Setup the development environment
 	$(call exec,uv sync --dev)
 
 format:  # Format code
-	$(call exec,uv run flynt .)
 	$(call exec,uv run ruff format)
 	$(call exec,uv run ruff check --fix)
 
 lint:
-	$(call exec,uv run flynt . --fail-on-change)
 	$(call exec,uv run ruff format --check)
 	$(call exec,uv run ruff check)
 

examples/bbox_detection/labelme2voc.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import argparse
 import glob

examples/instance_segmentation/labelme2voc.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import argparse
 import glob

examples/tutorial/load_label_png.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import os.path as osp
 
@@ -29,7 +28,7 @@ def main():
 
     print("label: label_name")
     for label, label_name in zip(labels, label_names):
-        print("%d: %s" % (label, label_name))
+        print(f"{label}: {label_name}")
 
 
 if __name__ == "__main__":

labelme/_label_file.py

@@ -1,4 +1,5 @@
 import base64
+import builtins
 import contextlib
 import io
 import json
@@ -21,7 +22,7 @@
 def open(name, mode):
     assert mode in ["r", "w"]
     encoding = "utf-8"
-    yield io.open(name, mode, encoding=encoding)
+    yield builtins.open(name, mode, encoding=encoding)
     return
 
 
@@ -124,7 +125,7 @@ class LabelFileError(Exception):
     pass
 
 
-class LabelFile(object):
+class LabelFile:
     shapes: list[ShapeDict]
     suffix = ".json"
 
@@ -140,7 +141,7 @@ def __init__(self, filename=None):
     def load_image_file(filename):
         try:
             image_pil = PIL.Image.open(filename)
-        except IOError:
+        except OSError:
             logger.error(f"Failed opening image file: {filename}")
             return
 

labelme/app.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import functools
 import html
 import math
@@ -93,7 +91,7 @@ def __init__(
         # Set point size from config file
         Shape.point_size = self._config["shape"]["point_size"]
 
-        super(MainWindow, self).__init__()
+        super().__init__()
         self.setWindowTitle(__appname__)
 
         # Whether we need to save or not.
@@ -1136,7 +1134,7 @@ def exists(filename):
         for i, f in enumerate(files):
             icon = utils.newIcon("labels")
             action = QtWidgets.QAction(
-                icon, "&%d %s" % (i + 1, QtCore.QFileInfo(f).fileName()), self
+                icon, f"&{i + 1} {QtCore.QFileInfo(f).fileName()}", self
             )
             action.triggered.connect(functools.partial(self.loadRecent, f))
             menu.addAction(action)
@@ -1752,7 +1750,7 @@ def resizeEvent(self, event):
             and self.zoomMode != self.MANUAL_ZOOM
         ):
             self.adjustScale()
-        super(MainWindow, self).resizeEvent(event)
+        super().resizeEvent(event)
 
     def paintCanvas(self):
         assert not self.image.isNull(), "cannot paint null image"

labelme/cli/draw_label_png.py

@@ -46,7 +46,7 @@ def main():
         logger.info(
             "Label names: {}".format(
                 [
-                    "{}:{}".format(label_value, label_names[label_value])
+                    f"{label_value}:{label_names[label_value]}"
                     for label_value in unique_label_values
                 ]
             )

labelme/cli/on_docker.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 
 import argparse
 import json

labelme/shape.py

@@ -12,7 +12,7 @@
 # - [opt] Store paths instead of creating new ones at each paint.
 
 
-class Shape(object):
+class Shape:
     # Render handles as squares
     P_SQUARE = 0
 

labelme/utils/_io.py

@@ -21,6 +21,6 @@ def lblsave(filename, lbl):
         lbl_pil.save(filename)
     else:
         raise ValueError(
-            "[%s] Cannot save the pixel-wise class label as PNG. "
-            "Please consider using the .npy format." % filename
+            f"[{filename}] Cannot save the pixel-wise class label as PNG. "
+            "Please consider using the .npy format."
         )