Skip to content

Commit

Permalink
Apply Ruff UP auto-fixes (unsafe fixes too)
Browse files Browse the repository at this point in the history
  • Loading branch information
akx committed Aug 13, 2024
1 parent 1071bf0 commit fb78cb2
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion labelme/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def main():
)

if reset_config:
logger.info("Resetting Qt config: %s" % win.settings.fileName())
logger.info(f"Resetting Qt config: {win.settings.fileName()}")
win.settings.clear()
sys.exit(0)

Expand Down
16 changes: 8 additions & 8 deletions labelme/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,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.
Expand Down Expand Up @@ -913,7 +913,7 @@ def menu(self, title, actions=None):

def toolbar(self, title, actions=None):
toolbar = ToolBar(title)
toolbar.setObjectName("%sToolBar" % title)
toolbar.setObjectName(f"{title}ToolBar")
# toolbar.setOrientation(Qt.Vertical)
toolbar.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
if actions:
Expand Down Expand Up @@ -1783,7 +1783,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"
Expand Down Expand Up @@ -1831,7 +1831,7 @@ def closeEvent(self, event):

def dragEnterEvent(self, event):
extensions = [
".%s" % fmt.data().decode().lower()
f".{fmt.data().decode().lower()}"
for fmt in QtGui.QImageReader.supportedImageFormats()
]
if event.mimeData().hasUrls():
Expand Down Expand Up @@ -1916,7 +1916,7 @@ def openFile(self, _value=False):
for fmt in QtGui.QImageReader.supportedImageFormats()
]
filters = self.tr("Image & Label files (%s)") % " ".join(
formats + ["*%s" % LabelFile.suffix]
formats + [f"*{LabelFile.suffix}"]
)
fileDialog = FileDialogPreview(self)
fileDialog.setFileMode(FileDialogPreview.ExistingFile)
Expand Down Expand Up @@ -2091,7 +2091,7 @@ def mayContinue(self):

def errorMessage(self, title, message):
return QtWidgets.QMessageBox.critical(
self, title, "<p><b>%s</b></p>%s" % (title, message)
self, title, f"<p><b>{title}</b></p>{message}"
)

def currentPath(self):
Expand Down Expand Up @@ -2167,7 +2167,7 @@ def imageList(self):

def importDroppedImageFiles(self, imageFiles):
extensions = [
".%s" % fmt.data().decode().lower()
f".{fmt.data().decode().lower()}"
for fmt in QtGui.QImageReader.supportedImageFormats()
]

Expand Down Expand Up @@ -2226,7 +2226,7 @@ def importDirImages(self, dirpath, pattern=None, load=True):

def scanAllImages(self, folderPath):
extensions = [
".%s" % fmt.data().decode().lower()
f".{fmt.data().decode().lower()}"
for fmt in QtGui.QImageReader.supportedImageFormats()
]

Expand Down
6 changes: 3 additions & 3 deletions labelme/cli/on_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ def get_ip():

def labelme_on_docker(in_file, out_file):
ip = get_ip()
cmd = "xhost + %s" % ip
cmd = f"xhost + {ip}"
subprocess.check_output(shlex.split(cmd))

if out_file:
out_file = osp.abspath(out_file)
if osp.exists(out_file):
raise RuntimeError("File exists: %s" % out_file)
raise RuntimeError(f"File exists: {out_file}")
else:
open(osp.abspath(out_file), "w")

Expand Down Expand Up @@ -91,7 +91,7 @@ def main():
try:
out_file = labelme_on_docker(args.in_file, args.output)
if out_file:
print("Saved to: %s" % out_file)
print(f"Saved to: {out_file}")
except RuntimeError as e:
sys.stderr.write(e.__str__() + "\n")
sys.exit(1)
Expand Down
4 changes: 2 additions & 2 deletions labelme/utils/_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."
)
4 changes: 2 additions & 2 deletions labelme/utils/qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

def newIcon(icon):
icons_dir = osp.join(here, "../icons")
return QtGui.QIcon(osp.join(":/", icons_dir, "%s.png" % icon))
return QtGui.QIcon(osp.join(":/", icons_dir, f"{icon}.png"))


def newButton(text, icon=None, slot=None):
Expand Down Expand Up @@ -95,4 +95,4 @@ def distancetoline(point, line):

def fmtShortcut(text):
mod, key = text.split("+", 1)
return "<b>%s</b>+<b>%s</b>" % (mod, key)
return f"<b>{mod}</b>+<b>{key}</b>"
2 changes: 1 addition & 1 deletion labelme/widgets/brightness_contrast_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class BrightnessContrastDialog(QtWidgets.QDialog):
_base_value = 50

def __init__(self, img, callback, parent=None):
super(BrightnessContrastDialog, self).__init__(parent)
super().__init__(parent)
self.setModal(True)
self.setWindowTitle("Brightness/Contrast")

Expand Down
16 changes: 8 additions & 8 deletions labelme/widgets/canvas.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def __init__(self, *args, **kwargs):
"ai_mask": False,
},
)
super(Canvas, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
# Initialise local state.
self.mode = self.EDIT
self.shapes = []
Expand Down Expand Up @@ -125,18 +125,18 @@ def createMode(self, value):
"ai_polygon",
"ai_mask",
]:
raise ValueError("Unsupported createMode: %s" % value)
raise ValueError(f"Unsupported createMode: {value}")
self._createMode = value

def initializeAiModel(self, name):
if name not in [model.name for model in labelme.ai.MODELS]:
raise ValueError("Unsupported ai model: %s" % name)
raise ValueError(f"Unsupported ai model: {name}")
model = [model for model in labelme.ai.MODELS if model.name == name][0]

if self._ai_model is not None and self._ai_model.name == model.name:
logger.debug("AI model is already initialized: %r" % model.name)
logger.debug(f"AI model is already initialized: {model.name!r}")
else:
logger.debug("Initializing AI model: %r" % model.name)
logger.debug(f"Initializing AI model: {model.name!r}")
self._ai_model = model()

if self.pixmap is None:
Expand Down Expand Up @@ -682,7 +682,7 @@ def boundedShiftShapes(self, shapes):

def paintEvent(self, event):
if not self.pixmap:
return super(Canvas, self).paintEvent(event)
return super().paintEvent(event)

p = self._painter
p.begin(self)
Expand Down Expand Up @@ -794,7 +794,7 @@ def transformPos(self, point):

def offsetToCenter(self):
s = self.scale
area = super(Canvas, self).size()
area = super().size()
w, h = self.pixmap.width() * s, self.pixmap.height() * s
aw, ah = area.width(), area.height()
x = (aw - w) / (2 * s) if aw > w else 0
Expand Down Expand Up @@ -912,7 +912,7 @@ def sizeHint(self):
def minimumSizeHint(self):
if self.pixmap:
return self.scale * self.pixmap.size()
return super(Canvas, self).minimumSizeHint()
return super().minimumSizeHint()

def wheelEvent(self, ev):
if QT5:
Expand Down
2 changes: 1 addition & 1 deletion labelme/widgets/color_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class ColorDialog(QtWidgets.QColorDialog):
def __init__(self, parent=None):
super(ColorDialog, self).__init__(parent)
super().__init__(parent)
self.setOption(QtWidgets.QColorDialog.ShowAlphaChannel)
# The Mac native dialog does not support our restore button.
self.setOption(QtWidgets.QColorDialog.DontUseNativeDialog)
Expand Down
2 changes: 1 addition & 1 deletion labelme/widgets/escapable_qlist_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

class EscapableQListWidget(QtWidgets.QListWidget):
def keyPressEvent(self, event):
super(EscapableQListWidget, self).keyPressEvent(event)
super().keyPressEvent(event)
if event.key() == Qt.Key_Escape:
self.clearSelection()
4 changes: 2 additions & 2 deletions labelme/widgets/file_dialog_preview.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class ScrollAreaPreview(QtWidgets.QScrollArea):
def __init__(self, *args, **kwargs):
super(ScrollAreaPreview, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

self.setWidgetResizable(True)

Expand All @@ -33,7 +33,7 @@ def clear(self):

class FileDialogPreview(QtWidgets.QFileDialog):
def __init__(self, *args, **kwargs):
super(FileDialogPreview, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.setOption(self.DontUseNativeDialog, True)

self.labelPreview = ScrollAreaPreview(self)
Expand Down
4 changes: 2 additions & 2 deletions labelme/widgets/label_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def keyPressEvent(self, e):
if e.key() in [QtCore.Qt.Key_Up, QtCore.Qt.Key_Down]:
self.list_widget.keyPressEvent(e)
else:
super(LabelQLineEdit, self).keyPressEvent(e)
super().keyPressEvent(e)


class LabelDialog(QtWidgets.QDialog):
Expand All @@ -42,7 +42,7 @@ def __init__(
fit_to_content = {"row": False, "column": True}
self._fit_to_content = fit_to_content

super(LabelDialog, self).__init__(parent)
super().__init__(parent)
self.edit = LabelQLineEdit()
self.edit.setPlaceholderText(text)
self.edit.setValidator(labelme.utils.labelValidator())
Expand Down
6 changes: 3 additions & 3 deletions labelme/widgets/label_list_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# https://stackoverflow.com/a/2039745/4158863
class HTMLDelegate(QtWidgets.QStyledItemDelegate):
def __init__(self, parent=None):
super(HTMLDelegate, self).__init__()
super().__init__()
self.doc = QtGui.QTextDocument(self)

def paint(self, painter, option, index):
Expand Down Expand Up @@ -67,7 +67,7 @@ def sizeHint(self, option, index):

class LabelListWidgetItem(QtGui.QStandardItem):
def __init__(self, text=None, shape=None):
super(LabelListWidgetItem, self).__init__()
super().__init__()
self.setText(text or "")
self.setShape(shape)

Expand Down Expand Up @@ -106,7 +106,7 @@ class LabelListWidget(QtWidgets.QListView):
itemSelectionChanged = QtCore.Signal(list, list)

def __init__(self):
super(LabelListWidget, self).__init__()
super().__init__()
self._selectedItems = []

self.setWindowFlags(Qt.Window)
Expand Down
4 changes: 2 additions & 2 deletions labelme/widgets/tool_bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class ToolBar(QtWidgets.QToolBar):
def __init__(self, title):
super(ToolBar, self).__init__(title)
super().__init__(title)
layout = self.layout()
m = (0, 0, 0, 0)
layout.setSpacing(0)
Expand All @@ -14,7 +14,7 @@ def __init__(self, title):

def addAction(self, action):
if isinstance(action, QtWidgets.QWidgetAction):
return super(ToolBar, self).addAction(action)
return super().addAction(action)
btn = QtWidgets.QToolButton()
btn.setDefaultAction(action)
btn.setToolButtonStyle(self.toolButtonStyle())
Expand Down
2 changes: 1 addition & 1 deletion labelme/widgets/unique_label_qlist_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class UniqueLabelQListWidget(EscapableQListWidget):
def mousePressEvent(self, event):
super(UniqueLabelQListWidget, self).mousePressEvent(event)
super().mousePressEvent(event)
if not self.indexAt(event.pos()).isValid():
self.clearSelection()

Expand Down
4 changes: 2 additions & 2 deletions labelme/widgets/zoom_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class ZoomWidget(QtWidgets.QSpinBox):
def __init__(self, value=100):
super(ZoomWidget, self).__init__()
super().__init__()
self.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
self.setRange(1, 1000)
self.setSuffix(" %")
Expand All @@ -15,7 +15,7 @@ def __init__(self, value=100):
self.setAlignment(QtCore.Qt.AlignCenter)

def minimumSizeHint(self):
height = super(ZoomWidget, self).minimumSizeHint().height()
height = super().minimumSizeHint().height()
fm = QtGui.QFontMetrics(self.font())
width = fm.width(str(self.maximum()))
return QtCore.QSize(width, height)

0 comments on commit fb78cb2

Please sign in to comment.