Skip to content

Commit b83ee83

Browse files
hjmjohnsonhjmjohnson
committed
STYLE: Prefer fstrings for python 3.6+
The primary benefit is readability: Comparing percent and .format call formatting vs f-string: - with f-string, you don’t have to order multiple inputs in your head to see what output will look like - Extra parenthesis, and binary operation or function call can become last drop to make a complicated piece just too much to parse. Not that f-string did any magic, but it lacks an extra set of parenthesis. - It also uses 6 chars less than percent formatting and 10 chars less than the format call. ```bash pip install flynt flynt $(find . -name "*.py" |fgrep -v ThirdParty) ``` ``` Running flynt v.0.57 Flynt run has finished. Stats: Execution time: 0.847s Files modified: 33 Character count reduction: 1047 (0.20%) Per expression type: Old style (`%`) expressions attempted: 101/124 (81.5%) `.format(...)` calls attempted: 80/89 (89.9%) No concatenations attempted. F-string expressions created: 153 Out of all attempted transforms, 27 resulted in errors.
1 parent fd74a79 commit b83ee83

33 files changed

+155
-180
lines changed

‎Examples/RegistrationITKv4/ImageRegistration3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ def iterationUpdate():
129129
finalParameters = registration.GetOutput().Get().GetParameters()
130130

131131
print("Final Registration Parameters ")
132-
print("Translation X = %f" % (finalParameters.GetElement(0),))
133-
print("Translation Y = %f" % (finalParameters.GetElement(1),))
132+
print(f"Translation X = {finalParameters.GetElement(0):f}")
133+
print(f"Translation Y = {finalParameters.GetElement(1):f}")
134134

135135

136136
#

‎Examples/RegistrationITKv4/ImageRegistration4.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ def iterationUpdate():
141141
finalParameters = registration.GetOutput().Get().GetParameters()
142142

143143
print("Final Registration Parameters ")
144-
print("Translation X = %f" % (finalParameters.GetElement(0),))
145-
print("Translation Y = %f" % (finalParameters.GetElement(1),))
144+
print(f"Translation X = {finalParameters.GetElement(0):f}")
145+
print(f"Translation Y = {finalParameters.GetElement(1):f}")
146146

147147

148148
#

‎Examples/RegistrationITKv4/ImageRegistration5.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,9 @@
120120
initialParameters = transform.GetParameters()
121121

122122
print("Initial Parameters: ")
123-
print("Angle: %f" % (initialParameters.GetElement(0),))
123+
print(f"Angle: {initialParameters.GetElement(0):f}")
124124
print(
125-
"Center: %f, %f"
126-
% (initialParameters.GetElement(1), initialParameters.GetElement(2),)
125+
f"Center: {initialParameters.GetElement(1):f}, {initialParameters.GetElement(2):f}"
127126
)
128127
print(
129128
"Translation: %f, %f"
@@ -198,11 +197,11 @@ def iterationUpdate():
198197
finalParameters = registration.GetOutput().Get().GetParameters()
199198

200199
print("Final Registration Parameters ")
201-
print("Angle in radians = %f" % finalParameters.GetElement(0))
202-
print("Rotation Center X = %f" % finalParameters.GetElement(1))
203-
print("Rotation Center Y = %f" % finalParameters.GetElement(2))
204-
print("Translation in X = %f" % finalParameters.GetElement(3))
205-
print("Translation in Y = %f" % finalParameters.GetElement(4))
200+
print(f"Angle in radians = {finalParameters.GetElement(0):f}")
201+
print(f"Rotation Center X = {finalParameters.GetElement(1):f}")
202+
print(f"Rotation Center Y = {finalParameters.GetElement(2):f}")
203+
print(f"Translation in X = {finalParameters.GetElement(3):f}")
204+
print(f"Translation in Y = {finalParameters.GetElement(4):f}")
206205

207206

208207
#

‎Examples/Visualization/CannyEdgeDetectionImageFilterConnectVTKITK.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
# this is to show off the new PyCommand functionality. :)
7171
def progressEvent():
72-
print("%.0f%s done..." % (canny.GetProgress() * 100.0, "%"))
72+
print(f"{canny.GetProgress() * 100.0:.0f}{'%'} done...")
7373

7474

7575
pc = itk.itkPyCommand_New()

‎Modules/Core/GPUCommon/wrapping/test/itkGPUImageTest.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
print("Kernel : Addition")
7373
print("------------------")
7474
print("Before GPU kernel execution")
75-
print("SrcA : {0}".format(srcA.GetPixel(idx)))
76-
print("SrcB : {0}".format(srcB.GetPixel(idx)))
77-
print("Dest : {0}".format(dest.GetPixel(idx)))
75+
print(f"SrcA : {srcA.GetPixel(idx)}")
76+
print(f"SrcB : {srcB.GetPixel(idx)}")
77+
print(f"Dest : {dest.GetPixel(idx)}")
7878

7979
kernel_manager.SetKernelArgWithImage(kernel_add, 0, srcA.GetGPUDataManager())
8080
kernel_manager.SetKernelArgWithImage(kernel_add, 1, srcB.GetGPUDataManager())
@@ -84,9 +84,9 @@
8484

8585
print("------------------")
8686
print("After GPU kernel execution")
87-
print("SrcA : {0}".format(srcA.GetPixel(idx)))
88-
print("SrcB : {0}".format(srcB.GetPixel(idx)))
89-
print("Dest : {0}".format(dest.GetPixel(idx)))
87+
print(f"SrcA : {srcA.GetPixel(idx)}")
88+
print(f"SrcB : {srcB.GetPixel(idx)}")
89+
print(f"Dest : {dest.GetPixel(idx)}")
9090
print("======================")
9191

9292
#
@@ -98,9 +98,9 @@
9898
print("Kernel : Multiplication")
9999
print("------------------")
100100
print("Before GPU kernel execution")
101-
print("SrcA : {0}".format(srcA.GetPixel(idx)))
102-
print("SrcB : {0}".format(srcB.GetPixel(idx)))
103-
print("Dest : {0}".format(dest.GetPixel(idx)))
101+
print(f"SrcA : {srcA.GetPixel(idx)}")
102+
print(f"SrcB : {srcB.GetPixel(idx)}")
103+
print(f"Dest : {dest.GetPixel(idx)}")
104104

105105
kernel_manager.SetKernelArgWithImage(kernel_mult, 0, srcA.GetGPUDataManager())
106106
kernel_manager.SetKernelArgWithImage(kernel_mult, 1, srcB.GetGPUDataManager())
@@ -110,9 +110,9 @@
110110

111111
print("------------------")
112112
print("After GPU kernel execution")
113-
print("SrcA : {0}".format(srcA.GetPixel(idx)))
114-
print("SrcB : {0}".format(srcB.GetPixel(idx)))
115-
print("Dest : {0}".format(dest.GetPixel(idx)))
113+
print(f"SrcA : {srcA.GetPixel(idx)}")
114+
print(f"SrcB : {srcB.GetPixel(idx)}")
115+
print(f"Dest : {dest.GetPixel(idx)}")
116116
print("======================")
117117

118118
#
@@ -127,7 +127,7 @@
127127
else:
128128
print("Only one GPU device available, using same command queue.")
129129

130-
print("Current Command Queue ID : {0}".format(queueID))
130+
print(f"Current Command Queue ID : {queueID}")
131131

132132
#
133133
# create subtraction kernel
@@ -148,9 +148,9 @@
148148
print("Kernel : Subtraction")
149149
print("------------------")
150150
print("Before GPU kernel execution")
151-
print("SrcA : {0}".format(srcA.GetPixel(idx)))
152-
print("SrcB : {0}".format(srcB.GetPixel(idx)))
153-
print("Dest : {0}".format(dest.GetPixel(idx)))
151+
print(f"SrcA : {srcA.GetPixel(idx)}")
152+
print(f"SrcB : {srcB.GetPixel(idx)}")
153+
print(f"Dest : {dest.GetPixel(idx)}")
154154

155155
kernel_manager.SetKernelArgWithImage(kernel_sub, 0, srcA.GetGPUDataManager())
156156
kernel_manager.SetKernelArgWithImage(kernel_sub, 1, srcB.GetGPUDataManager())
@@ -160,7 +160,7 @@
160160

161161
print("------------------")
162162
print("After GPU kernel execution")
163-
print("SrcA : {0}".format(srcA.GetPixel(idx)))
164-
print("SrcB : {0}".format(srcB.GetPixel(idx)))
165-
print("Dest : {0}".format(dest.GetPixel(idx)))
163+
print(f"SrcA : {srcA.GetPixel(idx)}")
164+
print(f"SrcB : {srcB.GetPixel(idx)}")
165+
print(f"Dest : {dest.GetPixel(idx)}")
166166
print("======================")

‎Modules/Filtering/GPUAnisotropicSmoothing/wrapping/test/itkGPUGradientAnisotropicDiffusionImageFilterTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
gpu_timer.Stop()
9595

96-
print("GPU NeighborhoodFilter took {0} seconds.\n".format(gpu_timer.GetMean()))
96+
print(f"GPU NeighborhoodFilter took {gpu_timer.GetMean()} seconds.\n")
9797

9898
output_image = itk.cast_image_filter(
9999
gpu_filter.GetOutput(), ttype=(OutputGPUImageType, OutputImageType)

‎Modules/Filtering/GPUImageFilterBase/wrapping/test/itkGPUNeighborhoodOperatorImageFilterTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494

9595
gpu_timer.Stop()
9696

97-
print("GPU NeighborhoodFilter took {0} seconds.\n".format(gpu_timer.GetMean()))
97+
print(f"GPU NeighborhoodFilter took {gpu_timer.GetMean()} seconds.\n")
9898

9999
output_image = itk.cast_image_filter(
100100
gpu_filter.GetOutput(), ttype=(OutputGPUImageType, OutputImageType)

‎Modules/Filtering/GPUSmoothing/wrapping/test/itkGPUMeanImageFilterTest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
gpu_timer.Stop()
8080

81-
print("GPU MeanFilter took {0} seconds.\n".format(gpu_timer.GetMean()))
81+
print(f"GPU MeanFilter took {gpu_timer.GetMean()} seconds.\n")
8282

8383
output_image = itk.cast_image_filter(
8484
gpu_filter.GetOutput(), ttype=(OutputGPUImageType, OutputImageType)

‎Modules/Segmentation/LevelSets/wrapping/test/GeodesicActiveContourImageFilterTest.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
def main():
4747
if len(argv) < 10:
4848
errMsg = (
49-
"Missing parameters\n"
50-
"Usage: %s\n" % (argv[0],) + " inputImage outputImage\n"
49+
f"Missing parameters\nUsage: {argv[0]}\n" + " inputImage outputImage\n"
5150
" seedX seedY InitialDistance\n"
5251
" Sigma SigmoidAlpha SigmoidBeta\n"
5352
" PropagationScaling\n"
@@ -159,10 +158,10 @@ def rescaleAndWrite(filter, fileName):
159158

160159
print("")
161160
print("Max. no. iterations: %d" % (geodesicActiveContour.GetNumberOfIterations()))
162-
print("Max. RMS error: %.3f" % (geodesicActiveContour.GetMaximumRMSError()))
161+
print(f"Max. RMS error: {geodesicActiveContour.GetMaximumRMSError():.3f}")
163162
print("")
164163
print("No. elapsed iterations: %d" % (geodesicActiveContour.GetElapsedIterations()))
165-
print("RMS change: %.3f" % (geodesicActiveContour.GetRMSChange()))
164+
print(f"RMS change: {geodesicActiveContour.GetRMSChange():.3f}")
166165

167166
itk.imwrite(
168167
fastMarching,

‎Utilities/ITKv5Preparation/replaceClassWithTypename.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def replaceOneInstance(desired_outs):
2828

2929

3030
for fileName in sys.argv[1:]:
31-
print("Processing {fname}".format(fname=fileName))
31+
print(f"Processing {fileName}")
3232
filePtr = open(fileName, "r")
3333
fileOrignalText = filePtr.read()
3434
filePtr.close()

0 commit comments

Comments
 (0)