aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/tools')
-rw-r--r--mediagoblin/tools/pluginapi.py2
-rw-r--r--mediagoblin/tools/processing.py4
-rw-r--r--mediagoblin/tools/response.py2
-rw-r--r--mediagoblin/tools/routing.py2
-rw-r--r--mediagoblin/tools/translate.py6
5 files changed, 8 insertions, 8 deletions
diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py
index be125a0e..9f74b252 100644
--- a/mediagoblin/tools/pluginapi.py
+++ b/mediagoblin/tools/pluginapi.py
@@ -128,7 +128,7 @@ class PluginManager:
def register_route(self, route):
"""Registers a single route"""
- _log.debug('registering route: {}'.format(route))
+ _log.debug(f'registering route: {route}')
self.routes.append(route)
def get_routes(self):
diff --git a/mediagoblin/tools/processing.py b/mediagoblin/tools/processing.py
index aa086a30..f9efeba7 100644
--- a/mediagoblin/tools/processing.py
+++ b/mediagoblin/tools/processing.py
@@ -47,7 +47,7 @@ def json_processing_callback(entry):
Send an HTTP post to the registered callback url, if any.
'''
if not entry.processing_metadata:
- _log.debug('No processing callback URL for {}'.format(entry))
+ _log.debug(f'No processing callback URL for {entry}')
return
url = entry.processing_metadata[0].callback_url
@@ -76,7 +76,7 @@ def json_processing_callback(entry):
try:
request.urlopen(request)
- _log.debug('Processing callback for {} sent'.format(entry))
+ _log.debug(f'Processing callback for {entry} sent')
return True
except request.HTTPError:
diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py
index eb9d4e6f..3e175873 100644
--- a/mediagoblin/tools/response.py
+++ b/mediagoblin/tools/response.py
@@ -105,7 +105,7 @@ def render_http_exception(request, exc, description):
elif stock_desc and exc.code == 404:
return render_404(request)
- return render_error(request, title='{} {}'.format(exc.code, exc.name),
+ return render_error(request, title=f'{exc.code} {exc.name}',
err_msg=description,
status=exc.code)
diff --git a/mediagoblin/tools/routing.py b/mediagoblin/tools/routing.py
index ebd2c08e..c06dfb00 100644
--- a/mediagoblin/tools/routing.py
+++ b/mediagoblin/tools/routing.py
@@ -49,7 +49,7 @@ def endpoint_to_controller(rule):
endpoint = rule.endpoint
view_func = rule.gmg_controller
- _log.debug('endpoint: {} view_func: {}'.format(endpoint, view_func))
+ _log.debug(f'endpoint: {endpoint} view_func: {view_func}')
# import the endpoint, or if it's already a callable, call that
if isinstance(view_func, str):
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index ce4cd4d3..ae1d73cb 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -69,10 +69,10 @@ def locale_to_lower_upper(locale):
"""
if '-' in locale:
lang, country = locale.split('-', 1)
- return '{}_{}'.format(lang.lower(), country.upper())
+ return f'{lang.lower()}_{country.upper()}'
elif '_' in locale:
lang, country = locale.split('_', 1)
- return '{}_{}'.format(lang.lower(), country.upper())
+ return f'{lang.lower()}_{country.upper()}'
else:
return locale.lower()
@@ -83,7 +83,7 @@ def locale_to_lower_lower(locale):
"""
if '_' in locale:
lang, country = locale.split('_', 1)
- return '{}-{}'.format(lang.lower(), country.lower())
+ return f'{lang.lower()}-{country.lower()}'
else:
return locale.lower()