diff --git a/src/java/util/__init__.py b/src/java/util/__init__.py index 8192442..1f9a384 100644 --- a/src/java/util/__init__.py +++ b/src/java/util/__init__.py @@ -69,9 +69,9 @@ def __repr__(self): def __str__(self): ret = self.language if self.country: - ret += "_{}".format(self.country) + ret += f"_{self.country}" if self.variant: - ret += "_{}".format(self.variant) + ret += f"_{self.variant}" return unicode(ret) @ClassProperty diff --git a/src/system/dataset.py b/src/system/dataset.py index f5d944f..9d7fc87 100644 --- a/src/system/dataset.py +++ b/src/system/dataset.py @@ -233,7 +233,7 @@ def dataSetToHTML( The HTML page as a string. """ print(showHeaders, dataset, title) - return "{}data".format(title) + return f"{title}data" def deleteRow(dataset, rowIndex): diff --git a/src/system/file.py b/src/system/file.py index 50e10b2..fffbfe6 100644 --- a/src/system/file.py +++ b/src/system/file.py @@ -52,7 +52,7 @@ def getTempFile(extension): Returns: The path to the newly created temp file. """ - suffix = ".{}".format(extension) + suffix = f".{extension}" with tempfile.NamedTemporaryFile(suffix=suffix) as temp: return temp.name diff --git a/src/system/gui.py b/src/system/gui.py index 398d023..5d232ce 100644 --- a/src/system/gui.py +++ b/src/system/gui.py @@ -422,7 +422,7 @@ def inputBox( options = ["OK", "Cancel"] panel = JPanel() - label = JLabel("{}: ".format(message)) + label = JLabel(f"{message}: ") panel.add(label) text_field = JTextField(25) text_field.setText(defaultText) diff --git a/src/system/sfc.py b/src/system/sfc.py index b69cbc9..b37f108 100644 --- a/src/system/sfc.py +++ b/src/system/sfc.py @@ -116,7 +116,7 @@ def resumeChart(instanceId): KeyError: If the ID does not match any running chart instance. """ if not instanceId: - raise KeyError("Invalid UUID string: {}".format(instanceId)) + raise KeyError(f"Invalid UUID string: {instanceId}") def setVariable( diff --git a/src/system/util.py b/src/system/util.py index 124e9db..b6a0ebb 100644 --- a/src/system/util.py +++ b/src/system/util.py @@ -331,7 +331,7 @@ def getProperty(propertyName): elif propertyName == "os.version": ret = platform.release() elif propertyName == "user.home": - ret = os.path.expanduser(str("~")) + ret = os.path.expanduser("~") elif propertyName == "user.name": ret = getpass.getuser() @@ -869,7 +869,7 @@ def threadDump(): Returns: The dump of the current running JVM. """ - return "Ignition version: {}...".format(version.__version__) + return f"Ignition version: {version.__version__}..." def translate(