Simplify a few format calls

Author: amorison

stagpy/__main__.py

@@ -20,12 +20,11 @@ def main():
     except error.StagpyError as err:
         if DEBUG:
             raise
+        errtype = type(err).__name__
         print('Oops! StagPy encountered the following problem while '
-              'processing your request.',
-              'Please check the path to your simulation and the command line '
-              'arguments.', '',
-              '{}: {}'.format(err.__class__.__name__, err),
-              sep='\n', file=sys.stderr)
+              'processing your request.', 'Please check the path to your '
+              'simulation and the command line arguments.', '',
+              f'{errtype}: {err}', sep='\n', file=sys.stderr)
         sys.exit()
 
 

stagpy/commands.py

@@ -27,15 +27,11 @@ def info_cmd():
     lstep = sdat.steps[-1]
     print(f'StagYY run in {sdat.path}')
     if lsnap.geom.threed:
-        dimension = '{} x {} x {}'.format(lsnap.geom.nxtot,
-                                          lsnap.geom.nytot,
-                                          lsnap.geom.nztot)
+        dimension = '{0.nxtot} x {0.nytot} x {0.nztot}'.format(lsnap.geom)
     elif lsnap.geom.twod_xz:
-        dimension = '{} x {}'.format(lsnap.geom.nxtot,
-                                     lsnap.geom.nztot)
+        dimension = '{0.nxtot} x {0.nztot}'.format(lsnap.geom)
     else:
-        dimension = '{} x {}'.format(lsnap.geom.nytot,
-                                     lsnap.geom.nztot)
+        dimension = '{0.nytot} x {0.nztot}'.format(lsnap.geom)
     if lsnap.geom.cartesian:
         print('Cartesian', dimension)
     elif lsnap.geom.cylindrical:

stagpy/misc.py

@@ -9,8 +9,6 @@
 
 from . import conf
 
-INT_FMT = '{:05d}'
-
 
 def out_name(stem, timestep=None):
     """Return StagPy out file name.
@@ -29,7 +27,7 @@ def out_name(stem, timestep=None):
     if conf.core.shortname:
         return conf.core.outname
     if timestep is not None:
-        stem = (stem + INT_FMT).format(timestep)
+        stem = f'{stem}{timestep:05d}'
     return conf.core.outname + '_' + stem
 
 
@@ -45,8 +43,7 @@ def scilabel(value, precision=2):
     Returns:
         str: the scientific notation the specified value.
     """
-    fmt = f'{{:.{precision}e}}'
-    man, exp = fmt.format(value).split('e')
+    man, exp = f'{value:.{precision}e}'.split('e')
     exp = int(exp)
     return fr'{man}\times 10^{{{exp}}}'