refactor: replace string concatenations with f-strings
All checks were successful
CI / test (push) Successful in 50s
All checks were successful
CI / test (push) Successful in 50s
This commit is contained in:
@@ -76,7 +76,7 @@ theme_names = {
|
||||
@yt_app.context_processor
|
||||
def inject_theme_preference():
|
||||
return {
|
||||
'theme_path': '/youtube.com/static/' + theme_names[settings.theme] + '.css',
|
||||
'theme_path': f'/youtube.com/static/{theme_names[settings.theme]}.css',
|
||||
'settings': settings,
|
||||
# Detect version
|
||||
'current_version': app_version()['version'],
|
||||
@@ -145,9 +145,9 @@ def error_page(e):
|
||||
' exit node is overutilized. Try getting a new exit node by'
|
||||
' using the New Identity button in the Tor Browser.')
|
||||
if fetch_err.error_message:
|
||||
error_message += '\n\n' + fetch_err.error_message
|
||||
error_message += f'\n\n{fetch_err.error_message}'
|
||||
if fetch_err.ip:
|
||||
error_message += '\n\nExit node IP address: ' + fetch_err.ip
|
||||
error_message += f'\n\nExit node IP address: {fetch_err.ip}'
|
||||
return flask.render_template('error.html', error_message=error_message, slim=slim), 502
|
||||
|
||||
elif error_code == '429':
|
||||
@@ -157,7 +157,7 @@ def error_page(e):
|
||||
'• Enable Tor routing in Settings for automatic IP rotation\n'
|
||||
'• Use a VPN to change your IP address')
|
||||
if fetch_err.ip:
|
||||
error_message += '\n\nYour IP: ' + fetch_err.ip
|
||||
error_message += f'\n\nYour IP: {fetch_err.ip}'
|
||||
return flask.render_template('error.html', error_message=error_message, slim=slim), 429
|
||||
|
||||
elif error_code == '502' and ('Failed to resolve' in str(fetch_err) or 'Failed to establish' in str(fetch_err)):
|
||||
@@ -179,7 +179,7 @@ def error_page(e):
|
||||
# Catch-all for any other FetchError (400, etc.)
|
||||
error_message = f'Error communicating with YouTube ({error_code}).'
|
||||
if fetch_err.error_message:
|
||||
error_message += '\n\n' + fetch_err.error_message
|
||||
error_message += f'\n\n{fetch_err.error_message}'
|
||||
return flask.render_template('error.html', error_message=error_message, slim=slim), 502
|
||||
|
||||
return flask.render_template('error.html', traceback=traceback.format_exc(),
|
||||
|
||||
Reference in New Issue
Block a user