style: apply consistent multi-line string formatting (#1166)

Author: mwtoews

autotest/t007_test.py

@@ -1016,15 +1016,15 @@ def test_namfile_readwrite():
     m2 = fm.Modflow.load("junk.nam", model_ws=os.path.join("temp", "t007"))
 
     t_value = abs(m2.modelgrid.xoffset - xll)
-    msg = "m2.modelgrid.xoffset ({}) ".format(
-        m2.modelgrid.xoffset
-    ) + "does not equal {}".format(xll)
+    msg = "m2.modelgrid.xoffset ({}) does not equal {}".format(
+        m2.modelgrid.xoffset, xll
+    )
     assert t_value < 1e-2, msg
 
     t_value = abs(m2.modelgrid.yoffset - yll)
-    msg = "m2.modelgrid.yoffset ({}) ".format(
-        m2.modelgrid.yoffset
-    ) + "does not equal {}".format(yll)
+    msg = "m2.modelgrid.yoffset ({}) does not equal {}".format(
+        m2.modelgrid.yoffset, yll
+    )
     assert t_value < 1e-2
 
     msg = (

autotest/t008_test.py

@@ -118,10 +118,8 @@ def load_nwt(nwtfile):
     ]
     for l in lst:
         msg = (
-            "{} data ".format(l)
-            + "instantiated from "
-            + "{} load ".format(os.path.basename(nwtfile))
-            + " is not the same as written to {}".format(os.path.basename(fn))
+            "{} data instantiated from {} load  is not the same as written to "
+            "{}".format(l, nwtfile, os.path.basename(fn))
         )
         assert nwt2[l] == nwt[l], msg
 
@@ -151,9 +149,8 @@ def load_nwt_model(nfile):
         ]
         for l in lst:
             msg = (
-                "{}.{} data ".format(pn, l)
-                + "instantiated from {} load ".format(model_ws)
-                + " is not the same as written to {}".format(tpth)
+                "{}.{} data instantiated from {} load  is not the same as "
+                "written to {}".format(pn, l, model_ws, tpth)
             )
             assert p[l] == p2[l], msg
 

autotest/t017_test.py

@@ -240,15 +240,15 @@ def test_cellbudgetfile_readrecord():
     t = v.get_data(text="STREAM LEAKAGE", full3D=True)
     assert t[0].shape == (1, 15, 10), (
         "3D sfr budget data does not have correct shape (1, 15,10) - "
-        + "returned shape {}".format(t[0].shape)
+        "returned shape {}".format(t[0].shape)
     )
 
     for kk in kstpkper:
         t = v.get_data(kstpkper=kk, text="STREAM LEAKAGE", full3D=True)[0]
         assert t.shape == (1, 15, 10), (
-            "3D sfr budget data for kstpkper {} ".format(kk)
-            + "does not have correct shape (1, 15,10) - "
-            + "returned shape {}".format(t[0].shape)
+            "3D sfr budget data for kstpkper {} "
+            "does not have correct shape (1, 15,10) - "
+            "returned shape {}".format(kk, t[0].shape)
         )
 
     idx = v.get_indices()
@@ -295,15 +295,15 @@ def test_cellbudgetfile_readrecord_waux():
     t = v.get_data(text="WELLS", full3D=True)
     assert t[0].shape == (1, 15, 10), (
         "3D wel budget data does not have correct shape (1, 15,10) - "
-        + "returned shape {}".format(t[0].shape)
+        "returned shape {}".format(t[0].shape)
     )
 
     for kk in kstpkper:
         t = v.get_data(kstpkper=kk, text="wells", full3D=True)[0]
         assert t.shape == (1, 15, 10), (
-            "3D wel budget data for kstpkper {} ".format(kk)
-            + "does not have correct shape (1, 15,10) - "
-            + "returned shape {}".format(t[0].shape)
+            "3D wel budget data for kstpkper {} "
+            "does not have correct shape (1, 15,10) - "
+            "returned shape {}".format(kk, t[0].shape)
         )
 
     idx = v.get_indices()

autotest/t025_test.py

@@ -50,7 +50,7 @@ def load_lak(mfnam, pth, run):
         try:
             success, buff = m.run_model(silent=True)
         except:
-            msg = "could not run base model " + "{}".format(
+            msg = "could not run base model {}".format(
                 os.path.splitext(mfnam)[0]
             )
             print(msg)
@@ -79,7 +79,7 @@ def load_lak(mfnam, pth, run):
         try:
             success, buff = m.run_model(silent=False)
         except:
-            msg = "could not run new model " + "{}".format(
+            msg = "could not run new model {}".format(
                 os.path.splitext(mfnam)[0]
             )
             print(msg)

autotest/t039_test.py

@@ -314,14 +314,14 @@ def test_zonebudget_output_to_netcdf():
 
     # test built in export function
     zbout = "freyberg_mlt.2.csv"
-    ncf_name = zbout + ".bi1" + ".nc"
+    ncf_name = zbout + ".bi1.nc"
 
     zb = ZoneBudgetOutput(os.path.join(zb_ws, zbout), ml.dis, zone_array)
     zb.export(os.path.join(outpth, ncf_name), ml)
 
     # test built in export function with NetCdf output object
     zbout = "freyberg_mlt.2.csv"
-    ncf_name = zbout + ".bi2" + ".nc"
+    ncf_name = zbout + ".bi2.nc"
 
     zb = ZoneBudgetOutput(os.path.join(zb_ws, zbout), ml.dis, zone_array)
     export_dict = {"hds": hds}

autotest/t041_test.py

@@ -292,7 +292,7 @@ def test_filenames():
     # Write the model input files
     m.write_input()
 
-    s = "output filename ({}) does " "not match specified name".format(
+    s = "output filename ({}) does not match specified name".format(
         m.get_output(unit=51)
     )
     assert m.get_output(unit=51) == f_out, s

autotest/t049_test.py

@@ -79,7 +79,7 @@ def test_modpath():
         except:
             success = False
         assert success, (
-            "forward modpath model run " + "did not terminate successfully"
+            "forward modpath model run did not terminate successfully"
         )
 
     mpnam = "freybergmpp"
@@ -107,7 +107,7 @@ def test_modpath():
         except:
             success = False
         assert success, (
-            "backward modpath model run " + "did not terminate successfully"
+            "backward modpath model run did not terminate successfully"
         )
 
     # load modpath output files
@@ -415,7 +415,7 @@ def eval_timeseries(file):
         tsd = ts.get_alldata()
     except:
         pass
-    msg = "could not load data using get_alldata() from " + "{}.".format(
+    msg = "could not load data using get_alldata() from {}.".format(
         os.path.basename(file)
     )
     assert len(tsd) > 0, msg

autotest/t074_test_geospatial_util.py

@@ -214,7 +214,7 @@ def test_multipolygon():
 
         if not is_equal:
             raise AssertionError(
-                "GeoSpatialUtil multipolygon " "conversion error"
+                "GeoSpatialUtil multipolygon conversion error"
             )
 
 
@@ -247,7 +247,7 @@ def test_point():
         is_equal = gi1 == gi2
 
         if not is_equal:
-            raise AssertionError("GeoSpatialUtil point " "conversion error")
+            raise AssertionError("GeoSpatialUtil point conversion error")
 
 
 def test_multipoint():
@@ -279,9 +279,7 @@ def test_multipoint():
         is_equal = gi1 == gi2
 
         if not is_equal:
-            raise AssertionError(
-                "GeoSpatialUtil multipoint " "conversion error"
-            )
+            raise AssertionError("GeoSpatialUtil multipoint conversion error")
 
 
 def test_linestring():
@@ -313,9 +311,7 @@ def test_linestring():
         is_equal = gi1 == gi2
 
         if not is_equal:
-            raise AssertionError(
-                "GeoSpatialUtil linestring " "conversion error"
-            )
+            raise AssertionError("GeoSpatialUtil linestring conversion error")
 
 
 def test_multilinestring():
@@ -348,7 +344,7 @@ def test_multilinestring():
 
         if not is_equal:
             raise AssertionError(
-                "GeoSpatialUtil multilinestring " "conversion error"
+                "GeoSpatialUtil multilinestring conversion error"
             )
 
 
@@ -386,7 +382,7 @@ def test_polygon_collection():
 
             if not is_equal:
                 raise AssertionError(
-                    "GeoSpatialCollection Polygon " "conversion error"
+                    "GeoSpatialCollection Polygon conversion error"
                 )
 
 
@@ -420,7 +416,7 @@ def test_point_collection():
 
             if not is_equal:
                 raise AssertionError(
-                    "GeoSpatialCollection Point " "conversion error"
+                    "GeoSpatialCollection Point conversion error"
                 )
 
 
@@ -454,7 +450,7 @@ def test_linestring_collection():
 
             if not is_equal:
                 raise AssertionError(
-                    "GeoSpatialCollection Linestring " "conversion error"
+                    "GeoSpatialCollection Linestring conversion error"
                 )
 
 

flopy/datbase.py

@@ -18,43 +18,43 @@ class DataInterface:
     @abc.abstractmethod
     def data_type(self):
         raise NotImplementedError(
-            "must define dat_type in child " "class to use this base class"
+            "must define dat_type in child class to use this base class"
         )
 
     @property
     @abc.abstractmethod
     def dtype(self):
         def dtype(self):
             raise NotImplementedError(
-                "must define dtype in child " "class to use this base class"
+                "must define dtype in child class to use this base class"
             )
 
     @property
     @abc.abstractmethod
     def array(self):
         raise NotImplementedError(
-            "must define array in child " "class to use this base class"
+            "must define array in child class to use this base class"
         )
 
     @property
     @abc.abstractmethod
     def name(self):
         raise NotImplementedError(
-            "must define name in child " "class to use this base class"
+            "must define name in child class to use this base class"
         )
 
     @property
     @abc.abstractmethod
     def model(self):
         raise NotImplementedError(
-            "must define name in child " "class to use this base class"
+            "must define name in child class to use this base class"
         )
 
     @property
     @abc.abstractmethod
     def plottable(self):
         raise NotImplementedError(
-            "must define plottable in child " "class to use this base class"
+            "must define plottable in child class to use this base class"
         )
 
 
@@ -63,15 +63,15 @@ class DataListInterface:
     @abc.abstractmethod
     def package(self):
         raise NotImplementedError(
-            "must define package in child " "class to use this base class"
+            "must define package in child class to use this base class"
         )
 
     @property
     @abc.abstractmethod
     def to_array(self, kper=0, mask=False):
         def to_array(self):
             raise NotImplementedError(
-                "must define to_array in child " "class to use this base class"
+                "must define to_array in child class to use this base class"
             )
 
     @abc.abstractmethod

flopy/discretization/vertexgrid.py

@@ -273,7 +273,7 @@ def intersect(self, x, y, local=False, forgive=False):
         if Path is None:
             s = (
                 "Could not import matplotlib.  Must install matplotlib "
-                + " in order to use VertexGrid.intersect() method"
+                "in order to use VertexGrid.intersect() method"
             )
             raise ImportError(s)