Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove f-strings #520

Merged
merged 3 commits into from Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions repo2docker/app.py
Expand Up @@ -426,7 +426,8 @@ def push_image(self):
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
Expand Down Expand Up @@ -568,7 +569,7 @@ def build(self):
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:
Expand Down
2 changes: 1 addition & 1 deletion repo2docker/contentproviders/git.py
Expand Up @@ -38,7 +38,7 @@ def fetch(self, spec, output_dir, yield_output=False):
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,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_args.py
Expand Up @@ -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():
"""
Expand Down