Clean up with black

This commit is contained in:
Oliver Falk
2021-09-14 15:54:37 +02:00
parent d2e28fe809
commit 85ccf0f7be

221
config.py
View File

@@ -1,6 +1,7 @@
''' yes # -*- coding: utf-8 -*-
"""
Configuration overrides for settings.py Configuration overrides for settings.py
''' """
import os import os
import sys import sys
@@ -14,50 +15,59 @@ from ivatar.settings import INSTALLED_APPS
from ivatar.settings import TEMPLATES from ivatar.settings import TEMPLATES
ADMIN_USERS = [] ADMIN_USERS = []
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ["*"]
INSTALLED_APPS.extend([ INSTALLED_APPS.extend(
'django_extensions', [
'django_openid_auth', "django_extensions",
'bootstrap4', "django_openid_auth",
'anymail', "bootstrap4",
'ivatar', "anymail",
'ivatar.ivataraccount', "ivatar",
'ivatar.tools', "ivatar.ivataraccount",
]) "ivatar.tools",
]
)
MIDDLEWARE.extend([ MIDDLEWARE.extend(
'django.middleware.locale.LocaleMiddleware', [
]) "django.middleware.locale.LocaleMiddleware",
]
)
MIDDLEWARE.insert( MIDDLEWARE.insert(
0, 'ivatar.middleware.MultipleProxyMiddleware', 0,
"ivatar.middleware.MultipleProxyMiddleware",
) )
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
# Enable this to allow LDAP authentication. # Enable this to allow LDAP authentication.
# See INSTALL for more information. # See INSTALL for more information.
# 'django_auth_ldap.backend.LDAPBackend', # 'django_auth_ldap.backend.LDAPBackend',
'django_openid_auth.auth.OpenIDBackend', "django_openid_auth.auth.OpenIDBackend",
'django.contrib.auth.backends.ModelBackend', "django.contrib.auth.backends.ModelBackend",
) )
TEMPLATES[0]['DIRS'].extend([ TEMPLATES[0]["DIRS"].extend(
os.path.join(BASE_DIR, 'templates'), [
]) os.path.join(BASE_DIR, "templates"),
TEMPLATES[0]['OPTIONS']['context_processors'].append( ]
'ivatar.context_processors.basepage', )
TEMPLATES[0]["OPTIONS"]["context_processors"].append(
"ivatar.context_processors.basepage",
) )
OPENID_CREATE_USERS = True OPENID_CREATE_USERS = True
OPENID_UPDATE_DETAILS_FROM_SREG = True OPENID_UPDATE_DETAILS_FROM_SREG = True
SITE_NAME = os.environ.get('SITE_NAME', 'libravatar') SITE_NAME = os.environ.get("SITE_NAME", "libravatar")
IVATAR_VERSION = '1.4' IVATAR_VERSION = "1.4"
SECURE_BASE_URL = os.environ.get('SECURE_BASE_URL', 'https://avatars.linux-kernel.at/avatar/') SECURE_BASE_URL = os.environ.get(
BASE_URL = os.environ.get('BASE_URL', 'http://avatars.linux-kernel.at/avatar/') "SECURE_BASE_URL", "https://avatars.linux-kernel.at/avatar/"
)
BASE_URL = os.environ.get("BASE_URL", "http://avatars.linux-kernel.at/avatar/")
LOGIN_REDIRECT_URL = reverse_lazy('profile') LOGIN_REDIRECT_URL = reverse_lazy("profile")
MAX_LENGTH_EMAIL = 254 # http://stackoverflow.com/questions/386294 MAX_LENGTH_EMAIL = 254 # http://stackoverflow.com/questions/386294
MAX_NUM_PHOTOS = 5 MAX_NUM_PHOTOS = 5
@@ -75,119 +85,120 @@ MIN_LENGTH_EMAIL = 6 # eg. x@x.xx
MAX_LENGTH_EMAIL = 254 # http://stackoverflow.com/questions/386294 MAX_LENGTH_EMAIL = 254 # http://stackoverflow.com/questions/386294
BOOTSTRAP4 = { BOOTSTRAP4 = {
'include_jquery': False, "include_jquery": False,
'javascript_in_head': False, "javascript_in_head": False,
'css_url': { "css_url": {
'href': '/static/css/bootstrap.min.css', "href": "/static/css/bootstrap.min.css",
'integrity': "integrity": "sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB",
'sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB', "crossorigin": "anonymous",
'crossorigin': 'anonymous',
}, },
'javascript_url': { "javascript_url": {
'url': '/static/js/bootstrap.min.js', "url": "/static/js/bootstrap.min.js",
'integrity': '', "integrity": "",
'crossorigin': 'anonymous', "crossorigin": "anonymous",
}, },
'popper_url': { "popper_url": {
'url': '/static/js/popper.min.js', "url": "/static/js/popper.min.js",
'integrity': "integrity": "sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49",
'sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49', "crossorigin": "anonymous",
'crossorigin': 'anonymous',
}, },
} }
if 'EMAIL_BACKEND' in os.environ: if "EMAIL_BACKEND" in os.environ:
EMAIL_BACKEND = os.environ['EMAIL_BACKEND'] # pragma: no cover EMAIL_BACKEND = os.environ["EMAIL_BACKEND"] # pragma: no cover
else: else:
if 'test' in sys.argv or 'collectstatic' in sys.argv: if "test" in sys.argv or "collectstatic" in sys.argv:
EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
else: else:
try: try:
ANYMAIL = { # pragma: no cover ANYMAIL = { # pragma: no cover
'MAILGUN_API_KEY': os.environ['IVATAR_MAILGUN_API_KEY'], "MAILGUN_API_KEY": os.environ["IVATAR_MAILGUN_API_KEY"],
'MAILGUN_SENDER_DOMAIN': os.environ['IVATAR_MAILGUN_SENDER_DOMAIN'], "MAILGUN_SENDER_DOMAIN": os.environ["IVATAR_MAILGUN_SENDER_DOMAIN"],
} }
EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend' # pragma: no cover EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend" # pragma: no cover
except Exception as exc: # pragma: nocover except Exception: # pragma: nocover # pylint: disable=broad-except
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
SERVER_EMAIL = os.environ.get('SERVER_EMAIL', 'ivatar@mg.linux-kernel.at') SERVER_EMAIL = os.environ.get("SERVER_EMAIL", "ivatar@mg.linux-kernel.at")
DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL', 'ivatar@mg.linux-kernel.at') DEFAULT_FROM_EMAIL = os.environ.get("DEFAULT_FROM_EMAIL", "ivatar@mg.linux-kernel.at")
try: try:
from ivatar.settings import DATABASES from ivatar.settings import DATABASES
except ImportError: # pragma: no cover except ImportError: # pragma: no cover
DATABASES = [] # pragma: no cover DATABASES = [] # pragma: no cover
if 'default' not in DATABASES: if "default" not in DATABASES:
DATABASES['default'] = { # pragma: no cover DATABASES["default"] = { # pragma: no cover
'ENGINE': 'django.db.backends.sqlite3', "ENGINE": "django.db.backends.sqlite3",
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
} }
if 'MYSQL_DATABASE' in os.environ: if "MYSQL_DATABASE" in os.environ:
DATABASES['default'] = { # pragma: no cover DATABASES["default"] = { # pragma: no cover
'ENGINE': 'django.db.backends.mysql', "ENGINE": "django.db.backends.mysql",
'NAME': os.environ['MYSQL_DATABASE'], "NAME": os.environ["MYSQL_DATABASE"],
'USER': os.environ['MYSQL_USER'], "USER": os.environ["MYSQL_USER"],
'PASSWORD': os.environ['MYSQL_PASSWORD'], "PASSWORD": os.environ["MYSQL_PASSWORD"],
'HOST': 'mysql', "HOST": "mysql",
} }
if 'POSTGRESQL_DATABASE' in os.environ: if "POSTGRESQL_DATABASE" in os.environ:
DATABASES['default'] = { # pragma: no cover DATABASES["default"] = { # pragma: no cover
'ENGINE': 'django.db.backends.postgresql', "ENGINE": "django.db.backends.postgresql",
'NAME': os.environ['POSTGRESQL_DATABASE'], "NAME": os.environ["POSTGRESQL_DATABASE"],
'USER': os.environ['POSTGRESQL_USER'], "USER": os.environ["POSTGRESQL_USER"],
'PASSWORD': os.environ['POSTGRESQL_PASSWORD'], "PASSWORD": os.environ["POSTGRESQL_PASSWORD"],
'HOST': 'postgresql', "HOST": "postgresql",
} }
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
USE_X_FORWARDED_HOST = True USE_X_FORWARDED_HOST = True
ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = ['avatars.linux-kernel.at', 'localhost',] ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = [
"avatars.linux-kernel.at",
"localhost",
]
DEFAULT_AVATAR_SIZE = 80 DEFAULT_AVATAR_SIZE = 80
LANGUAGES = ( LANGUAGES = (
('de', _('Deutsch')), ("de", _("Deutsch")),
('en', _('English')), ("en", _("English")),
('ca', _('Català')), ("ca", _("Català")),
('cs', _('Česky')), ("cs", _("Česky")),
('es', _('Español')), ("es", _("Español")),
('eu', _('Basque')), ("eu", _("Basque")),
('fr', _('Français')), ("fr", _("Français")),
('it', _('Italiano')), ("it", _("Italiano")),
('ja', _('日本語')), ("ja", _("日本語")),
('nl', _('Nederlands')), ("nl", _("Nederlands")),
('pt', _('Português')), ("pt", _("Português")),
('ru', _('Русский')), ("ru", _("Русский")),
('sq', _('Shqip')), ("sq", _("Shqip")),
('tr', _('Türkçe')), ("tr", _("Türkçe")),
('uk', _('Українська')), ("uk", _("Українська")),
) )
MESSAGE_TAGS = { MESSAGE_TAGS = {
message_constants.DEBUG: 'debug', message_constants.DEBUG: "debug",
message_constants.INFO: 'info', message_constants.INFO: "info",
message_constants.SUCCESS: 'success', message_constants.SUCCESS: "success",
message_constants.WARNING: 'warning', message_constants.WARNING: "warning",
message_constants.ERROR: 'danger', message_constants.ERROR: "danger",
} }
CACHES = { CACHES = {
'default': { "default": {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', "BACKEND": "django.core.cache.backends.memcached.MemcachedCache",
'LOCATION': [ "LOCATION": [
'127.0.0.1:11211', "127.0.0.1:11211",
], ],
}, },
'filesystem': { "filesystem": {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
'LOCATION': '/var/tmp/ivatar_cache', "LOCATION": "/var/tmp/ivatar_cache",
'TIMEOUT': 900, # 15 minutes "TIMEOUT": 900, # 15 minutes
} },
} }
# This is 5 minutes caching for generated/resized images, # This is 5 minutes caching for generated/resized images,
@@ -197,5 +208,5 @@ CACHE_IMAGES_MAX_AGE = 5 * 60
CACHE_RESPONSE = True CACHE_RESPONSE = True
# This MUST BE THE LAST! # This MUST BE THE LAST!
if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')): if os.path.isfile(os.path.join(BASE_DIR, "config_local.py")):
from config_local import * # noqa # flake8: noqa # NOQA # pragma: no cover from config_local import * # noqa # flake8: noqa # NOQA # pragma: no cover