apply pyupgrade --py36-plus

1 files changed, 19 insertions, 24 deletions

diff --git a/examples/imagepipe/imagepipe.py b/examples/imagepipe/imagepipe.py
index d46c33f..95f5c42 100644
--- a/examples/imagepipe/imagepipe.py
+++ b/examples/imagepipe/imagepipe.py
@@ -60,10 +60,8 @@ def generator(f):
 
     @processor
     def new_func(stream, *args, **kwargs):
-        for item in stream:
-            yield item
-        for item in f(*args, **kwargs):
-            yield item
+        yield from stream
+        yield from f(*args, **kwargs)
 
     return update_wrapper(new_func, f)
 
@@ -89,7 +87,7 @@ def open_cmd(images):
     """
     for image in images:
         try:
-            click.echo("Opening '{}'".format(image))
+            click.echo(f"Opening '{image}'")
             if image == "-":
                 img = Image.open(click.get_binary_stdin())
                 img.filename = "-"
@@ -97,7 +95,7 @@ def open_cmd(images):
                 img = Image.open(image)
             yield img
         except Exception as e:
-            click.echo("Could not open image '{}': {}".format(image, e), err=True)
+            click.echo(f"Could not open image '{image}': {e}", err=True)
 
 
 @cli.command("save")
@@ -114,12 +112,10 @@ def save_cmd(images, filename):
     for idx, image in enumerate(images):
         try:
             fn = filename.format(idx + 1)
-            click.echo("Saving '{}' as '{}'".format(image.filename, fn))
+            click.echo(f"Saving '{image.filename}' as '{fn}'")
             yield image.save(fn)
         except Exception as e:
-            click.echo(
-                "Could not save image '{}': {}".format(image.filename, e), err=True
-            )
+            click.echo(f"Could not save image '{image.filename}': {e}", err=True)
 
 
 @cli.command("display")
@@ -127,7 +123,7 @@ def save_cmd(images, filename):
 def display_cmd(images):
     """Opens all images in an image viewer."""
     for image in images:
-        click.echo("Displaying '{}'".format(image.filename))
+        click.echo(f"Displaying '{image.filename}'")
         image.show()
         yield image
 
@@ -142,7 +138,7 @@ def resize_cmd(images, width, height):
     """
     for image in images:
         w, h = (width or image.size[0], height or image.size[1])
-        click.echo("Resizing '{}' to {}x{}".format(image.filename, w, h))
+        click.echo(f"Resizing '{image.filename}' to {w}x{h}")
         image.thumbnail((w, h))
         yield image
 
@@ -160,7 +156,7 @@ def crop_cmd(images, border):
         if border is not None:
             for idx, val in enumerate(box):
                 box[idx] = max(0, val - border)
-            click.echo("Cropping '{}' by {}px".format(image.filename, border))
+            click.echo(f"Cropping '{image.filename}' by {border}px")
             yield copy_filename(image.crop(box), image)
         else:
             yield image
@@ -176,7 +172,7 @@ def convert_rotation(ctx, param, value):
         return (Image.ROTATE_180, 180)
     if value in ("-90", "270", "l", "left"):
         return (Image.ROTATE_270, 270)
-    raise click.BadParameter("invalid rotation '{}'".format(value))
+    raise click.BadParameter(f"invalid rotation '{value}'")
 
 
 def convert_flip(ctx, param, value):
@@ -187,7 +183,7 @@ def convert_flip(ctx, param, value):
         return (Image.FLIP_LEFT_RIGHT, "left to right")
     if value in ("tb", "topbottom", "upsidedown", "ud"):
         return (Image.FLIP_LEFT_RIGHT, "top to bottom")
-    raise click.BadParameter("invalid flip '{}'".format(value))
+    raise click.BadParameter(f"invalid flip '{value}'")
 
 
 @cli.command("transpose")
@@ -201,11 +197,11 @@ def transpose_cmd(images, rotate, flip):
     for image in images:
         if rotate is not None:
             mode, degrees = rotate
-            click.echo("Rotate '{}' by {}deg".format(image.filename, degrees))
+            click.echo(f"Rotate '{image.filename}' by {degrees}deg")
             image = copy_filename(image.transpose(mode), image)
         if flip is not None:
             mode, direction = flip
-            click.echo("Flip '{}' {}".format(image.filename, direction))
+            click.echo(f"Flip '{image.filename}' {direction}")
             image = copy_filename(image.transpose(mode), image)
         yield image
 
@@ -217,7 +213,7 @@ def blur_cmd(images, radius):
     """Applies gaussian blur."""
     blur = ImageFilter.GaussianBlur(radius)
     for image in images:
-        click.echo("Blurring '{}' by {}px".format(image.filename, radius))
+        click.echo(f"Blurring '{image.filename}' by {radius}px")
         yield copy_filename(image.filter(blur), image)
 
 
@@ -248,7 +244,7 @@ def smoothen_cmd(images, iterations):
 def emboss_cmd(images):
     """Embosses an image."""
     for image in images:
-        click.echo("Embossing '{}'".format(image.filename))
+        click.echo(f"Embossing '{image.filename}'")
         yield copy_filename(image.filter(ImageFilter.EMBOSS), image)
 
 
@@ -260,7 +256,7 @@ def emboss_cmd(images):
 def sharpen_cmd(images, factor):
     """Sharpens an image."""
     for image in images:
-        click.echo("Sharpen '{}' by {}".format(image.filename, factor))
+        click.echo(f"Sharpen '{image.filename}' by {factor}")
         enhancer = ImageEnhance.Sharpness(image)
         yield copy_filename(enhancer.enhance(max(1.0, factor)), image)
 
@@ -282,13 +278,12 @@ def paste_cmd(images, left, right):
             yield image
         return
 
-    click.echo("Paste '{}' on '{}'".format(to_paste.filename, image.filename))
+    click.echo(f"Paste '{to_paste.filename}' on '{image.filename}'")
     mask = None
     if to_paste.mode == "RGBA" or "transparency" in to_paste.info:
         mask = to_paste
     image.paste(to_paste, (left, right), mask)
-    image.filename += "+{}".format(to_paste.filename)
+    image.filename += f"+{to_paste.filename}"
     yield image
 
-    for image in imageiter:
-        yield image
+    yield from imageiter