More pyupgrade (#111)

zingale · web-flow · commit 396f6ba75076 · 2022-10-11T14:07:52.000-04:00
diff --git a/advection/problems/smooth.py b/advection/problems/smooth.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy
diff --git a/advection/problems/test.py b/advection/problems/test.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 
diff --git a/advection/problems/tophat.py b/advection/problems/tophat.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 from util import msg
diff --git a/advection_fv4/problems/smooth.py b/advection_fv4/problems/smooth.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import mesh.fv as fv
 import numpy
 from util import msg
diff --git a/advection_nonuniform/problems/slotted.py b/advection_nonuniform/problems/slotted.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import numpy as np
 
 import mesh.patch as patch
diff --git a/advection_nonuniform/problems/test.py b/advection_nonuniform/problems/test.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import mesh.patch as patch
 from util import msg
 
diff --git a/compare.py b/compare.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 
 import numpy as np
 import sys
@@ -55,9 +54,9 @@ def compare(data1, data2, rtol=1.e-12):
 
         if not np.any(d2.v() == 0):
             rel_err = np.max(np.abs(d1.v() - d2.v()) / np.abs(d2.v()))
-            print("{:20s} absolute error = {:10.10g}, relative error = {:10.10g}".format(name, abs_err, rel_err))
+            print(f"{name:20s} absolute error = {abs_err:10.10g}, relative error = {rel_err:10.10g}")
         else:
-            print("{:20s} absolute error = {:10.10g}".format(name, abs_err))
+            print(f"{name:20s} absolute error = {abs_err:10.10g}")
 
         if not np.allclose(d1.v(), d2.v(), rtol=rtol):
             result = "varerr"
diff --git a/compressible/problems/acoustic_pulse.py b/compressible/problems/acoustic_pulse.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.fv as fv
 import numpy as np
diff --git a/compressible/problems/advect.py b/compressible/problems/advect.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy as np
diff --git a/compressible/problems/bubble.py b/compressible/problems/bubble.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 import sys
 
diff --git a/compressible/problems/gresho.py b/compressible/problems/gresho.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import numpy
 import mesh.patch as patch
diff --git a/compressible/problems/hse.py b/compressible/problems/hse.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import sys
diff --git a/compressible/problems/kh.py b/compressible/problems/kh.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import mesh.patch as patch
diff --git a/compressible/problems/logo.py b/compressible/problems/logo.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy as np
diff --git a/compressible/problems/quad.py b/compressible/problems/quad.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 
 import numpy as np
diff --git a/compressible/problems/ramp.py b/compressible/problems/ramp.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 
 import numpy as np
diff --git a/compressible/problems/rt.py b/compressible/problems/rt.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import sys
diff --git a/compressible/problems/rt2.py b/compressible/problems/rt2.py
@@ -3,7 +3,6 @@
 how the growth rate depends on wavenumber.
 """
 
-from __future__ import print_function
 
 import numpy as np
 
diff --git a/compressible/problems/sedov.py b/compressible/problems/sedov.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy as np
diff --git a/compressible/problems/sod.py b/compressible/problems/sod.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 
 import mesh.patch as patch
diff --git a/compressible/problems/test.py b/compressible/problems/test.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 
diff --git a/compressible_react/problems/flame.py b/compressible_react/problems/flame.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy as np
diff --git a/compressible_react/problems/rt.py b/compressible_react/problems/rt.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import sys
diff --git a/compressible_sr/problems/acoustic_pulse.py b/compressible_sr/problems/acoustic_pulse.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 from util import msg
 
diff --git a/compressible_sr/problems/advect.py b/compressible_sr/problems/advect.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy as np
diff --git a/compressible_sr/problems/bubble.py b/compressible_sr/problems/bubble.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 import sys
 
diff --git a/compressible_sr/problems/gresho.py b/compressible_sr/problems/gresho.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import numpy as np
 import mesh.patch as patch
diff --git a/compressible_sr/problems/hse.py b/compressible_sr/problems/hse.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import sys
diff --git a/compressible_sr/problems/kh.py b/compressible_sr/problems/kh.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import mesh.patch as patch
diff --git a/compressible_sr/problems/logo.py b/compressible_sr/problems/logo.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import compressible_sr.eos as eos
diff --git a/compressible_sr/problems/quad.py b/compressible_sr/problems/quad.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 
 import numpy as np
diff --git a/compressible_sr/problems/rt.py b/compressible_sr/problems/rt.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import numpy as np
 
 import sys
diff --git a/compressible_sr/problems/rt2.py b/compressible_sr/problems/rt2.py
@@ -3,7 +3,6 @@
 how the growth rate depends on wavenumber.
 """
 
-from __future__ import print_function
 
 import numpy as np
 
diff --git a/compressible_sr/problems/sedov.py b/compressible_sr/problems/sedov.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import compressible_sr.eos as eos
diff --git a/compressible_sr/problems/sod.py b/compressible_sr/problems/sod.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 
 import mesh.patch as patch
diff --git a/compressible_sr/problems/test.py b/compressible_sr/problems/test.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 
diff --git a/diffusion/problems/gaussian.py b/diffusion/problems/gaussian.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 import numpy
diff --git a/diffusion/problems/test.py b/diffusion/problems/test.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys
 import mesh.patch as patch
 
diff --git a/examples/mesh/bc_demo.py b/examples/mesh/bc_demo.py
@@ -1,6 +1,5 @@
 # test the boundary fill routine
 
-from __future__ import print_function
 
 import numpy as np
 import mesh.patch
diff --git a/examples/mesh/experiments/test_indexer.py b/examples/mesh/experiments/test_indexer.py
@@ -1,6 +1,5 @@
 # some simple tests of the ArrayIndexer
 
-from __future__ import print_function
 
 import mesh.patch as patch
 import numpy as np
diff --git a/examples/mesh/experiments/test_subclass.py b/examples/mesh/experiments/test_subclass.py
@@ -16,7 +16,6 @@
 # to ensure that it is just a view and no copy is done.  Some experiment
 # on this is in mesh-exmaples.ipynb
 
-from __future__ import print_function
 
 import mesh.patch as patch
 import numpy as np
diff --git a/examples/multigrid/mg_test_general_alphabeta_only.py b/examples/multigrid/mg_test_general_alphabeta_only.py
@@ -28,7 +28,6 @@
 
 """
 
-from __future__ import print_function
 
 import os
 
@@ -151,7 +150,7 @@ def test_general_poisson_dirichlet(N, store_bench=False, comp_bench=False,
 
         plt.xlabel("x")
         plt.ylabel("y")
-        plt.title("nx = {}".format(nx))
+        plt.title(f"nx = {nx}")
 
         plt.colorbar(img1)
 
@@ -178,18 +177,18 @@ def test_general_poisson_dirichlet(N, store_bench=False, comp_bench=False,
     my_data = a.get_solution_object()
 
     if store_bench:
-        my_data.write("{}/{}".format(bench_dir, bench))
+        my_data.write(f"{bench_dir}/{bench}")
 
     # do we do a comparison?
     if comp_bench:
-        compare_file = "{}/{}".format(bench_dir, bench)
+        compare_file = f"{bench_dir}/{bench}"
         msg.warning("comparing to: %s " % (compare_file))
         bench = io.read(compare_file)
 
         result = compare.compare(my_data, bench, rtol)
 
         if result == 0:
-            msg.success("results match benchmark to within relative tolerance of {}\n".format(rtol))
+            msg.success(f"results match benchmark to within relative tolerance of {rtol}\n")
         else:
             msg.warning("ERROR: " + compare.errors[result] + "\n")
 
diff --git a/examples/multigrid/mg_test_general_beta_only.py b/examples/multigrid/mg_test_general_beta_only.py
@@ -28,7 +28,6 @@
 
 """
 
-from __future__ import print_function
 
 import os
 
@@ -151,7 +150,7 @@ def test_general_poisson_dirichlet(N, store_bench=False, comp_bench=False,
 
         plt.xlabel("x")
         plt.ylabel("y")
-        plt.title("nx = {}".format(nx))
+        plt.title(f"nx = {nx}")
 
         plt.colorbar(img1)
 
@@ -178,18 +177,18 @@ def test_general_poisson_dirichlet(N, store_bench=False, comp_bench=False,
     my_data = a.get_solution_object()
 
     if store_bench:
-        my_data.write("{}/{}".format(bench_dir, bench))
+        my_data.write(f"{bench_dir}/{bench}")
 
     # do we do a comparison?
     if comp_bench:
-        compare_file = "{}/{}".format(bench_dir, bench)
+        compare_file = f"{bench_dir}/{bench}"
         msg.warning("comparing to: %s " % (compare_file))
         bench = io.read(compare_file)
 
         result = compare.compare(my_data, bench, rtol)
 
         if result == 0:
-            msg.success("results match benchmark to within relative tolerance of {}\n".format(rtol))
+            msg.success(f"results match benchmark to within relative tolerance of {rtol}\n")
         else:
             msg.warning("ERROR: " + compare.errors[result] + "\n")
 
diff --git a/examples/multigrid/mg_test_general_constant.py b/examples/multigrid/mg_test_general_constant.py
@@ -15,7 +15,6 @@
 
 """
 
-from __future__ import print_function
 
 import os
 
@@ -137,7 +136,7 @@ def test_general_poisson_dirichlet(N, store_bench=False, comp_bench=False,
 
         plt.xlabel("x")
         plt.ylabel("y")
-        plt.title("nx = {}".format(nx))
+        plt.title(f"nx = {nx}")
 
         plt.colorbar(img1)
 
@@ -164,18 +163,18 @@ def test_general_poisson_dirichlet(N, store_bench=False, comp_bench=False,
     my_data = a.get_solution_object()
 
     if store_bench:
-        my_data.write("{}/{}".format(bench_dir, bench))
+        my_data.write(f"{bench_dir}/{bench}")
 
     # do we do a comparison?
     if comp_bench:
-        compare_file = "{}/{}".format(bench_dir, bench)
+        compare_file = f"{bench_dir}/{bench}"
         msg.warning("comparing to: %s " % (compare_file))
         bench = io.read(compare_file)
 
         result = compare.compare(my_data, bench)
 
         if result == 0:
-            msg.success("results match benchmark to within relative tolerance of {}\n".format(rtol))
+            msg.success(f"results match benchmark to within relative tolerance of {rtol}\n")
         else:
             msg.warning("ERROR: " + compare.errors[result] + "\n")
 
diff --git a/examples/multigrid/mg_test_general_dirichlet.py b/examples/multigrid/mg_test_general_dirichlet.py
diff --git a/examples/multigrid/mg_test_general_inhomogeneous.py b/examples/multigrid/mg_test_general_inhomogeneous.py
diff --git a/examples/multigrid/mg_test_simple.py b/examples/multigrid/mg_test_simple.py
diff --git a/examples/multigrid/mg_test_vc_constant.py b/examples/multigrid/mg_test_vc_constant.py
diff --git a/examples/multigrid/mg_test_vc_dirichlet.py b/examples/multigrid/mg_test_vc_dirichlet.py
diff --git a/examples/multigrid/mg_test_vc_periodic.py b/examples/multigrid/mg_test_vc_periodic.py
diff --git a/examples/multigrid/mg_vis.py b/examples/multigrid/mg_vis.py
diff --git a/examples/multigrid/prolong_restrict_demo.py b/examples/multigrid/prolong_restrict_demo.py
diff --git a/incompressible/problems/converge.py b/incompressible/problems/converge.py
diff --git a/incompressible/problems/shear.py b/incompressible/problems/shear.py
diff --git a/lm_atm/problems/bubble.py b/lm_atm/problems/bubble.py
diff --git a/lm_atm/problems/gresho.py b/lm_atm/problems/gresho.py
diff --git a/swe/problems/acoustic_pulse.py b/swe/problems/acoustic_pulse.py
diff --git a/swe/problems/advect.py b/swe/problems/advect.py
diff --git a/swe/problems/dam.py b/swe/problems/dam.py
diff --git a/swe/problems/kh.py b/swe/problems/kh.py
diff --git a/swe/problems/logo.py b/swe/problems/logo.py
diff --git a/swe/problems/quad.py b/swe/problems/quad.py
diff --git a/swe/problems/test.py b/swe/problems/test.py
diff --git a/test.py b/test.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import print_function`
`2`		`-`
`3`	`1`	`import sys`
`4`	`2`	`import mesh.patch as patch`
`5`	`3`	`import numpy`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import print_function`
`2`		`-`
`3`	`1`	`import mesh.fv as fv`
`4`	`2`	`import numpy`
`5`	`3`	`from util import msg`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import print_function`
`2`	`1`	`import numpy as np`
`3`	`2`
`4`	`3`	`import mesh.patch as patch`