crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 22:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

f strings instead of .format for string editing (#2987)

Browse source
This commit is contained in:
Jonathan Shimwell 2024-04-29 22:45:37 +01:00 • committed by GitHub
parent e8ae7063af
commit 5d2b352025
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 197 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

31
openmc/lib/plot.py
View file

@ -31,7 +31,7 @@ class _Position(Structure):
elif idx == 2:
return self.z
else:
raise IndexError("{} index is invalid for _Position".format(idx))
raise IndexError(f"{idx} index is invalid for _Position")
def __setitem__(self, idx, val):
if idx == 0:
@ -41,10 +41,10 @@ class _Position(Structure):
elif idx == 2:
self.z = val
else:
raise IndexError("{} index is invalid for _Position".format(idx))
raise IndexError(f"{idx} index is invalid for _Position")
def __repr__(self):
return "({}, {}, {})".format(self.x, self.y, self.z)
return f"({self.x}, {self.y}, {self.z})"
class _PlotBase(Structure):
@ -127,7 +127,7 @@ class _PlotBase(Structure):
elif self.basis_ == 3:
return 'yz'
raise ValueError("Plot basis {} is invalid".format(self.basis_))
raise ValueError(f"Plot basis {self.basis_} is invalid")
@basis.setter
def basis(self, basis):
@ -135,7 +135,7 @@ class _PlotBase(Structure):
valid_bases = ('xy', 'xz', 'yz')
basis = basis.lower()
if basis not in valid_bases:
raise ValueError("{} is not a valid plot basis.".format(basis))
raise ValueError(f"{basis} is not a valid plot basis.")
if basis == 'xy':
self.basis_ = 1
@ -148,12 +148,11 @@ class _PlotBase(Structure):
if isinstance(basis, int):
valid_bases = (1, 2, 3)
if basis not in valid_bases:
raise ValueError("{} is not a valid plot basis.".format(basis))
raise ValueError(f"{basis} is not a valid plot basis.")
self.basis_ = basis
return
raise ValueError("{} of type {} is an"
" invalid plot basis".format(basis, type(basis)))
raise ValueError(f"{basis} of type {type(basis)} is an invalid plot basis")
@property
def h_res(self):
@ -199,14 +198,14 @@ class _PlotBase(Structure):
out_str = ["-----",
"Plot:",
"-----",
"Origin: {}".format(self.origin),
"Width: {}".format(self.width),
"Height: {}".format(self.height),
"Basis: {}".format(self.basis),
"HRes: {}".format(self.h_res),
"VRes: {}".format(self.v_res),
"Color Overlaps: {}".format(self.color_overlaps),
"Level: {}".format(self.level)]
f"Origin: {self.origin}",
f"Width: {self.width}",
f"Height: {self.height}",
f"Basis: {self.basis}",
f"HRes: {self.h_res}",
f"VRes: {self.v_res}",
f"Color Overlaps: {self.color_overlaps}",
f"Level: {self.level}"]
return '\n'.join(out_str)