Upgrade Python syntax with pyupgrade https://github.com/asottile/pyupgrade

Author: hugovk

docs/source/examples/callback.py

@@ -20,7 +20,7 @@ def on_exists(fname):
 
     if os.path.isfile(fname):
         newfile = fname + ".old"
-        print("{0} -> {1}".format(fname, newfile))
+        print("{} -> {}".format(fname, newfile))
         os.rename(fname, newfile)
 
 

docs/source/examples/opencv_numpy.py

@@ -30,7 +30,7 @@
         # cv2.imshow('OpenCV/Numpy grayscale',
         #            cv2.cvtColor(img, cv2.COLOR_BGRA2GRAY))
 
-        print("fps: {0}".format(1 / (time.time() - last_time)))
+        print("fps: {}".format(1 / (time.time() - last_time)))
 
         # Press "q" to quit
         if cv2.waitKey(25) & 0xFF == ord("q"):

docs/source/examples/pil.py

@@ -22,6 +22,6 @@
         # img = Image.frombytes('RGB', sct_img.size, sct_img.rgb)
 
         # And save it!
-        output = "monitor-{0}.png".format(num)
+        output = "monitor-{}.png".format(num)
         img.save(output)
         print(output)

mss/base.py

@@ -116,7 +116,7 @@ def save(self, mon=0, output="monitor-{mon}.png", callback=None):
             try:
                 monitor = monitors[mon]
             except IndexError:
-                raise ScreenShotError("Monitor {0!r} does not exist.".format(mon))
+                raise ScreenShotError("Monitor {!r} does not exist.".format(mon))
 
             output = output.format(mon=mon, date=datetime.now(), **monitor)
             if callable(callback):

mss/darwin.py

@@ -32,7 +32,7 @@ class CGPoint(ctypes.Structure):
     _fields_ = [("x", cgfloat()), ("y", cgfloat())]
 
     def __repr__(self):
-        return "{0}(left={1} top={2})".format(type(self).__name__, self.x, self.y)
+        return "{}(left={} top={})".format(type(self).__name__, self.x, self.y)
 
 
 class CGSize(ctypes.Structure):
@@ -41,7 +41,7 @@ class CGSize(ctypes.Structure):
     _fields_ = [("width", cgfloat()), ("height", cgfloat())]
 
     def __repr__(self):
-        return "{0}(width={1} height={2})".format(
+        return "{}(width={} height={})".format(
             type(self).__name__, self.width, self.height
         )
 
@@ -52,7 +52,7 @@ class CGRect(ctypes.Structure):
     _fields_ = [("origin", CGPoint), ("size", CGSize)]
 
     def __repr__(self):
-        return "{0}<{1} {2}>".format(type(self).__name__, self.origin, self.size)
+        return "{}<{} {}>".format(type(self).__name__, self.origin, self.size)
 
 
 class MSS(MSSBase):

mss/factory.py

@@ -30,7 +30,7 @@ def mss(**kwargs):
         from .windows import MSS
     else:
         raise ScreenShotError(
-            "System {0!r} not (yet?) implemented.".format(operating_system)
+            "System {!r} not (yet?) implemented.".format(operating_system)
         )
 
     return MSS(**kwargs)

mss/linux.py

@@ -170,7 +170,7 @@ def __init__(self, display=None):
             display = display.encode("utf-8")
 
         if b":" not in display:
-            raise ScreenShotError("Bad display value: {0!r}.".format(display))
+            raise ScreenShotError("Bad display value: {!r}.".format(display))
 
         x11 = ctypes.util.find_library("X11")
         if not x11:
@@ -313,7 +313,7 @@ def validate(retval, func, args):
             if retval != 0 and not MSS.last_error:
                 return args
 
-            err = "{0}() failed".format(func.__name__)
+            err = "{}() failed".format(func.__name__)
             details = {"retval": retval, "args": args}
 
             if MSS.last_error:
@@ -329,7 +329,7 @@ def validate(retval, func, args):
                 xerror = xserver_error.value.decode("utf-8")
                 if xerror != "0":
                     details["xerror"] = xerror
-                    err += ": {0}".format(xerror)
+                    err += ": {}".format(xerror)
 
             raise ScreenShotError(err, details=details)
 
@@ -407,7 +407,7 @@ def grab(self, monitor):
         bits_per_pixel = ximage.contents.bits_per_pixel
         if bits_per_pixel != 32:
             raise ScreenShotError(
-                "[XImage] bits per pixel value not (yet?) implemented: {0}.".format(
+                "[XImage] bits per pixel value not (yet?) implemented: {}.".format(
                     bits_per_pixel
                 )
             )

mss/screenshot.py

@@ -149,5 +149,5 @@ def pixel(self, coord_x, coord_y):
             return self.pixels[coord_y][coord_x]
         except IndexError:
             raise ScreenShotError(
-                "Pixel location ({0}, {1}) is out of range.".format(coord_x, coord_y)
+                "Pixel location ({}, {}) is out of range.".format(coord_x, coord_y)
             )

tests/conftest.py

@@ -19,11 +19,11 @@ def purge_files():
     """ Remove all generated files from previous runs. """
 
     for fname in glob.glob("*.png"):
-        print("Deleting {0!r} ...".format(fname))
+        print("Deleting {!r} ...".format(fname))
         os.unlink(fname)
 
     for fname in glob.glob("*.png.old"):
-        print("Deleting {0!r} ...".format(fname))
+        print("Deleting {!r} ...".format(fname))
         os.unlink(fname)