apply pyupgrade

4 files changed, 17 insertions, 15 deletions

diff --git a/examples/aliases/aliases.py b/examples/aliases/aliases.py
index 8456a1b..1ebad50 100644
--- a/examples/aliases/aliases.py
+++ b/examples/aliases/aliases.py
@@ -139,4 +139,4 @@ def alias(config, alias_, cmd, config_file):
     """Adds an alias to the specified configuration file."""
     config.add_alias(alias_, cmd)
     config.write_config(config_file)
-    click.echo("Added %s as alias for %s" % (alias_, cmd))
+    click.echo("Added {} as alias for {}".format(alias_, cmd))
diff --git a/examples/imagepipe/imagepipe.py b/examples/imagepipe/imagepipe.py
index 2cde2f6..5e34405 100644
--- a/examples/imagepipe/imagepipe.py
+++ b/examples/imagepipe/imagepipe.py
@@ -97,7 +97,7 @@ def open_cmd(images):
                 img = Image.open(image)
             yield img
         except Exception as e:
-            click.echo('Could not open image "%s": %s' % (image, e), err=True)
+            click.echo('Could not open image "{}": {}'.format(image, e), err=True)
 
 
 @cli.command("save")
@@ -114,10 +114,12 @@ def save_cmd(images, filename):
     for idx, image in enumerate(images):
         try:
             fn = filename % (idx + 1)
-            click.echo('Saving "%s" as "%s"' % (image.filename, fn))
+            click.echo('Saving "{}" as "{}"'.format(image.filename, fn))
             yield image.save(fn)
         except Exception as e:
-            click.echo('Could not save image "%s": %s' % (image.filename, e), err=True)
+            click.echo(
+                'Could not save image "{}": {}'.format(image.filename, e), err=True
+            )
 
 
 @cli.command("display")
@@ -203,7 +205,7 @@ def transpose_cmd(images, rotate, flip):
             image = copy_filename(image.transpose(mode), image)
         if flip is not None:
             mode, direction = flip
-            click.echo('Flip "%s" %s' % (image.filename, direction))
+            click.echo('Flip "{}" {}'.format(image.filename, direction))
             image = copy_filename(image.transpose(mode), image)
         yield image
 
@@ -257,7 +259,7 @@ def emboss_cmd(images):
 def sharpen_cmd(images, factor):
     """Sharpens an image."""
     for image in images:
-        click.echo('Sharpen "%s" by %f' % (image.filename, factor))
+        click.echo('Sharpen "{}" by {:f}'.format(image.filename, factor))
         enhancer = ImageEnhance.Sharpness(image)
         yield copy_filename(enhancer.enhance(max(1.0, factor)), image)
 
@@ -279,7 +281,7 @@ def paste_cmd(images, left, right):
             yield image
         return
 
-    click.echo('Paste "%s" on "%s"' % (to_paste.filename, image.filename))
+    click.echo('Paste "{}" on "{}"'.format(to_paste.filename, image.filename))
     mask = None
     if to_paste.mode == "RGBA" or "transparency" in to_paste.info:
         mask = to_paste
diff --git a/examples/naval/naval.py b/examples/naval/naval.py
index cf9e00c..a77dea8 100644
--- a/examples/naval/naval.py
+++ b/examples/naval/naval.py
@@ -31,7 +31,7 @@ def ship_new(name):
 @click.option("--speed", metavar="KN", default=10, help="Speed in knots.")
 def ship_move(ship, x, y, speed):
     """Moves SHIP to the new location X,Y."""
-    click.echo("Moving ship %s to %s,%s with speed %s" % (ship, x, y, speed))
+    click.echo("Moving ship {} to {},{} with speed {}".format(ship, x, y, speed))
 
 
 @ship.command("shoot")
@@ -40,7 +40,7 @@ def ship_move(ship, x, y, speed):
 @click.argument("y", type=float)
 def ship_shoot(ship, x, y):
     """Makes SHIP fire to X,Y."""
-    click.echo("Ship %s fires to %s,%s" % (ship, x, y))
+    click.echo("Ship {} fires to {},{}".format(ship, x, y))
 
 
 @cli.group("mine")
@@ -61,7 +61,7 @@ def mine():
 @click.option("ty", "--drifting", flag_value="drifting", help="Drifting mine.")
 def mine_set(x, y, ty):
     """Sets a mine at a specific coordinate."""
-    click.echo("Set %s mine at %s,%s" % (ty, x, y))
+    click.echo("Set {} mine at {},{}".format(ty, x, y))
 
 
 @mine.command("remove")
@@ -69,4 +69,4 @@ def mine_set(x, y, ty):
 @click.argument("y", type=float)
 def mine_remove(x, y):
     """Removes a mine at a specific coordinate."""
-    click.echo("Removed mine at %s,%s" % (x, y))
+    click.echo("Removed mine at {},{}".format(x, y))
diff --git a/examples/repo/repo.py b/examples/repo/repo.py
index b9bf2f0..470296b 100644
--- a/examples/repo/repo.py
+++ b/examples/repo/repo.py
@@ -14,7 +14,7 @@ class Repo(object):
     def set_config(self, key, value):
         self.config[key] = value
         if self.verbose:
-            click.echo("  config[%s] = %s" % (key, value), file=sys.stderr)
+            click.echo("  config[{}] = {}".format(key, value), file=sys.stderr)
 
     def __repr__(self):
         return "<Repo %r>" % self.home
@@ -78,7 +78,7 @@ def clone(repo, src, dest, shallow, rev):
     """
     if dest is None:
         dest = posixpath.split(src)[-1] or "."
-    click.echo("Cloning repo %s to %s" % (src, os.path.abspath(dest)))
+    click.echo("Cloning repo {} to {}".format(src, os.path.abspath(dest)))
     repo.home = dest
     if shallow:
         click.echo("Making shallow checkout")
@@ -147,7 +147,7 @@ def commit(repo, files, message):
             return
     else:
         msg = "\n".join(message)
-    click.echo("Files to be committed: %s" % (files,))
+    click.echo("Files to be committed: {}".format(files))
     click.echo("Commit message:\n" + msg)
 
 
@@ -163,4 +163,4 @@ def copy(repo, src, dst, force):
     files from SRC to DST.
     """
     for fn in src:
-        click.echo("Copy from %s -> %s" % (fn, dst))
+        click.echo("Copy from {} -> {}".format(fn, dst))