Upgrade Python syntax with pyupgrade --py3-plus

Author: hugovk

sfs/array.py

@@ -38,7 +38,7 @@ class ArrayData(namedtuple('ArrayData', 'x n a')):
 
     def __repr__(self):
         return 'ArrayData(\n' + ',\n'.join(
-            '    {0}={1}'.format(name, repr(data).replace('\n', '\n      '))
+            '    {}={}'.format(name, repr(data).replace('\n', '\n      '))
             for name, data in zip('xna', self)) + ')'
 
     def take(self, indices):

sfs/mono/drivingfunction.py

@@ -51,7 +51,7 @@ def _wfs_point(omega, x0, n0, xs, c=None):
 
 
 def wfs_25d_point(omega, x0, n0, xs, xref=[0, 0, 0], c=None, omalias=None):
-    """Point source by 2.5-dimensional WFS.
+    r"""Point source by 2.5-dimensional WFS.
 
     ::
 
@@ -96,7 +96,7 @@ def _wfs_plane(omega, x0, n0, n=[0, 1, 0], c=None):
 
 def wfs_25d_plane(omega, x0, n0, n=[0, 1, 0], xref=[0, 0, 0], c=None,
                   omalias=None):
-    """Plane wave by 2.5-dimensional WFS.
+    r"""Plane wave by 2.5-dimensional WFS.
 
     ::
 
@@ -140,7 +140,7 @@ def _wfs_focused(omega, x0, n0, xs, c=None):
 
 
 def wfs_25d_focused(omega, x0, n0, xs, xref=[0, 0, 0], c=None, omalias=None):
-    """Focused source by 2.5-dimensional WFS.
+    r"""Focused source by 2.5-dimensional WFS.
 
     ::
 

sfs/mono/source.py

@@ -165,7 +165,7 @@ def point_averaged_intensity(omega, x0, n0, grid, c=None):
 
 
 def point_dipole(omega, x0, n0, grid, c=None):
-    """Point source with dipole characteristics.
+    r"""Point source with dipole characteristics.
 
     Parameters
     ----------

sfs/plot.py

@@ -394,7 +394,7 @@ def vectors(v, grid, cmap='blacktransparent', headlength=3, headaxislength=2.5,
 
 
 def add_colorbar(im, aspect=20, pad=0.5, **kwargs):
-    """Add a vertical color bar to a plot.
+    r"""Add a vertical color bar to a plot.
 
     Parameters
     ----------

sfs/util.py

@@ -431,7 +431,7 @@ def __getitem__(self, index):
 
     def __repr__(self):
         return 'XyzComponents(\n' + ',\n'.join(
-            '    {0}={1}'.format(name, repr(data).replace('\n', '\n      '))
+            '    {}={}'.format(name, repr(data).replace('\n', '\n      '))
             for name, data in zip('xyz', self)) + ')'
 
     def make_property(index, doc):