Merge pull request #520 from jrbourbeau/remove-f-strings

Remove f-strings

repo2docker/app.py

@@ -426,7 +426,8 @@ class Repo2Docker(Application):
                 self.log.info('Pushing image\n',
                               extra=dict(progress=layers, phase='pushing'))
                 last_emit_time = time.time()
-        self.log.info(f'Successfully pushed {self.output_image_spec}', extra=dict(phase='pushing'))
+        self.log.info('Successfully pushed {}'.format(self.output_image_spec),
+                      extra=dict(phase='pushing'))
 
     def run_image(self):
         """Run docker container from built image
@@ -568,7 +569,7 @@ class Repo2Docker(Application):
                 if not os.path.isdir(checkout_path):
                     self.log.error('Subdirectory %s does not exist',
                                    self.subdir, extra=dict(phase='failure'))
-                    raise FileNotFoundError(f'Could not find {checkout_path}')
+                    raise FileNotFoundError('Could not find {}'.format(checkout_path))
 
             with chdir(checkout_path):
                 for BP in self.buildpacks:

repo2docker/contentproviders/git.py

@@ -38,7 +38,7 @@ class Git(ContentProvider):
             if hash is None:
                 self.log.error('Failed to check out ref %s', ref,
                                extra=dict(phase='failed'))
-                raise ValueError(f'Failed to check out ref {ref}')
+                raise ValueError('Failed to check out ref {}'.format(ref))
             # If the hash is resolved above, we should be able to reset to it
             for line in execute_cmd(['git', 'reset', '--hard', hash],
                                     cwd=output_dir,

tests/unit/test_args.py

@@ -14,7 +14,7 @@ def test_version(capsys):
     """
     with pytest.raises(SystemExit):
         make_r2d(['--version'])
-    assert capsys.readouterr().out == f"{__version__}\n"
+    assert capsys.readouterr().out == "{}\n".format(__version__)
 
 def test_simple():
     """