From b870dde3010c374da8e33edaf18331818929f64e Mon Sep 17 00:00:00 2001 From: Sohalt Date: Tue, 15 Oct 2019 14:58:48 +0200 Subject: [PATCH] Replace occurrences of "blacklist" with "banlist" (#1434) * Rename blacklist to banlist * Rename more cases of blacklist to banlist * Rename Blacklist -> Banlist in migrations --- .../base/management/commands/makemigrations.py | 6 +++--- src/pretix/base/management/commands/migrate.py | 4 ++-- ...16_0648_squashed_0048_auto_20161129_1330.py | 4 ++-- .../base/migrations/0047_auto_20161126_1300.py | 4 ++-- ..._positionid_squashed_0061_event_location.py | 4 ++-- ...minvite_squashed_0070_auto_20170719_0910.py | 2 +- .../base/migrations/0053_auto_20170104_1252.py | 2 +- .../base/migrations/0057_auto_20170107_1531.py | 2 +- .../base/migrations/0063_auto_20170702_1711.py | 2 +- .../base/migrations/0077_auto_20171124_1629.py | 4 ++-- ...24_1629_squashed_0088_auto_20180328_1217.py | 4 ++-- .../base/migrations/0098_auto_20180731_1243.py | 2 +- ...1243_squashed_0100_item_require_approval.py | 2 +- src/pretix/base/models/event.py | 4 ++-- src/pretix/base/models/organizer.py | 4 ++-- src/pretix/base/shredder.py | 10 +++++----- src/pretix/base/validators.py | 18 +++++++++--------- src/pretix/control/logdisplay.py | 2 +- src/pretix/control/views/dashboards.py | 4 ++-- src/pretix/control/views/event.py | 4 ++-- src/pretix/helpers/metrics/middleware.py | 4 ++-- src/pretix/helpers/profile/middleware.py | 4 ++-- src/pretix/presale/forms/checkout.py | 4 ++-- src/tests/presale/test_event.py | 2 +- 24 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/pretix/base/management/commands/makemigrations.py b/src/pretix/base/management/commands/makemigrations.py index e65aafc31..dd2b955a4 100644 --- a/src/pretix/base/management/commands/makemigrations.py +++ b/src/pretix/base/management/commands/makemigrations.py @@ -23,7 +23,7 @@ modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_manager_name") modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("permissions") modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_permissions") IGNORED_ATTRS = [ - # (field type, attribute name, blacklist of field sub-types) + # (field type, attribute name, banlist of field sub-types) (models.Field, 'verbose_name', []), (models.Field, 'help_text', []), (models.Field, 'validators', []), @@ -38,8 +38,8 @@ original_deconstruct = models.Field.deconstruct def new_deconstruct(self): name, path, args, kwargs = original_deconstruct(self) - for ftype, attr, blacklist in IGNORED_ATTRS: - if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in blacklist): + for ftype, attr, banlist in IGNORED_ATTRS: + if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in banlist): kwargs.pop(attr, None) return name, path, args, kwargs diff --git a/src/pretix/base/management/commands/migrate.py b/src/pretix/base/management/commands/migrate.py index 3bfe5bbab..aeadf030c 100644 --- a/src/pretix/base/management/commands/migrate.py +++ b/src/pretix/base/management/commands/migrate.py @@ -11,13 +11,13 @@ from django.core.management.commands.migrate import Command as Parent class OutputFilter(OutputWrapper): - blacklist = ( + banlist = ( "Your models have changes that are not yet reflected", "Run 'manage.py makemigrations' to make new " ) def write(self, msg, style_func=None, ending=None): - if any(b in msg for b in self.blacklist): + if any(b in msg for b in self.banlist): return super().write(msg, style_func, ending) diff --git a/src/pretix/base/migrations/0031_auto_20160816_0648_squashed_0048_auto_20161129_1330.py b/src/pretix/base/migrations/0031_auto_20160816_0648_squashed_0048_auto_20161129_1330.py index 8a4e943d5..f1792ca31 100644 --- a/src/pretix/base/migrations/0031_auto_20160816_0648_squashed_0048_auto_20161129_1330.py +++ b/src/pretix/base/migrations/0031_auto_20160816_0648_squashed_0048_auto_20161129_1330.py @@ -182,12 +182,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='event', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Slug'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Slug'), ), migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Slug'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Slug'), ), migrations.AlterField( model_name='voucher', diff --git a/src/pretix/base/migrations/0047_auto_20161126_1300.py b/src/pretix/base/migrations/0047_auto_20161126_1300.py index 87e708639..fe504c082 100644 --- a/src/pretix/base/migrations/0047_auto_20161126_1300.py +++ b/src/pretix/base/migrations/0047_auto_20161126_1300.py @@ -23,12 +23,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='event', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Slug'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Slug'), ), migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Slug'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Slug'), ), migrations.AlterField( model_name='voucher', diff --git a/src/pretix/base/migrations/0050_orderposition_positionid_squashed_0061_event_location.py b/src/pretix/base/migrations/0050_orderposition_positionid_squashed_0061_event_location.py index a0fa7b368..5ccc6fc99 100644 --- a/src/pretix/base/migrations/0050_orderposition_positionid_squashed_0061_event_location.py +++ b/src/pretix/base/migrations/0050_orderposition_positionid_squashed_0061_event_location.py @@ -124,7 +124,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='event', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AddField( model_name='requiredaction', @@ -179,7 +179,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'), ), migrations.RunPython( code=merge_names, diff --git a/src/pretix/base/migrations/0052_team_teaminvite_squashed_0070_auto_20170719_0910.py b/src/pretix/base/migrations/0052_team_teaminvite_squashed_0070_auto_20170719_0910.py index 6a15d110d..0a8a548f4 100644 --- a/src/pretix/base/migrations/0052_team_teaminvite_squashed_0070_auto_20170719_0910.py +++ b/src/pretix/base/migrations/0052_team_teaminvite_squashed_0070_auto_20170719_0910.py @@ -346,7 +346,7 @@ class Migration(migrations.Migration): help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, and bank transfer references.', validators=[django.core.validators.RegexValidator( message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), - pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'), + pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AlterField( model_name='invoice', diff --git a/src/pretix/base/migrations/0053_auto_20170104_1252.py b/src/pretix/base/migrations/0053_auto_20170104_1252.py index 67f0fd224..0a595738b 100644 --- a/src/pretix/base/migrations/0053_auto_20170104_1252.py +++ b/src/pretix/base/migrations/0053_auto_20170104_1252.py @@ -33,7 +33,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='event', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This will be used in order codes, invoice numbers, links and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AddField( model_name='requiredaction', diff --git a/src/pretix/base/migrations/0057_auto_20170107_1531.py b/src/pretix/base/migrations/0057_auto_20170107_1531.py index 64d3a06f6..d9a03a4f0 100644 --- a/src/pretix/base/migrations/0057_auto_20170107_1531.py +++ b/src/pretix/base/migrations/0057_auto_20170107_1531.py @@ -36,7 +36,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. This is being used in addresses and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'), ), migrations.RunPython(merge_names, migrations.RunPython.noop) ] diff --git a/src/pretix/base/migrations/0063_auto_20170702_1711.py b/src/pretix/base/migrations/0063_auto_20170702_1711.py index 01fa646e9..75cecda42 100644 --- a/src/pretix/base/migrations/0063_auto_20170702_1711.py +++ b/src/pretix/base/migrations/0063_auto_20170702_1711.py @@ -38,7 +38,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='event', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters and numbers, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AlterField( model_name='invoice', diff --git a/src/pretix/base/migrations/0077_auto_20171124_1629.py b/src/pretix/base/migrations/0077_auto_20171124_1629.py index bbf6a49b2..c5c0f9c12 100644 --- a/src/pretix/base/migrations/0077_auto_20171124_1629.py +++ b/src/pretix/base/migrations/0077_auto_20171124_1629.py @@ -44,7 +44,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='event', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes, and must be unique among your events. We recommend some kind of abbreviation or a date with less than 10 characters that can be easily remembered, but you can also choose to use a random value. This will be used in URLs, order codes, invoice numbers, and bank transfer references.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AlterField( model_name='eventmetaproperty', @@ -54,7 +54,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'), ), migrations.CreateModel( name='CheckinList', diff --git a/src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py b/src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py index 51939a1bd..9a68747c7 100644 --- a/src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py +++ b/src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py @@ -105,7 +105,7 @@ class Migration(migrations.Migration): 'references.', validators=[django.core.validators.RegexValidator( message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), - pretix.base.validators.EventSlugBlacklistValidator()], verbose_name='Short form'), + pretix.base.validators.EventSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AlterField( model_name='eventmetaproperty', @@ -125,7 +125,7 @@ class Migration(migrations.Migration): ' events.', validators=[django.core.validators.RegexValidator( message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), - pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'), + pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'), ), migrations.CreateModel( name='CheckinList', diff --git a/src/pretix/base/migrations/0098_auto_20180731_1243.py b/src/pretix/base/migrations/0098_auto_20180731_1243.py index bf04b2306..291a37760 100644 --- a/src/pretix/base/migrations/0098_auto_20180731_1243.py +++ b/src/pretix/base/migrations/0098_auto_20180731_1243.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AlterField( model_name='staffsession', diff --git a/src/pretix/base/migrations/0098_auto_20180731_1243_squashed_0100_item_require_approval.py b/src/pretix/base/migrations/0098_auto_20180731_1243_squashed_0100_item_require_approval.py index 87ee93fee..bd9efae33 100644 --- a/src/pretix/base/migrations/0098_auto_20180731_1243_squashed_0100_item_require_approval.py +++ b/src/pretix/base/migrations/0098_auto_20180731_1243_squashed_0100_item_require_approval.py @@ -29,7 +29,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='organizer', name='slug', - field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBlacklistValidator()], verbose_name='Short form'), + field=models.SlugField(help_text='Should be short, only contain lowercase letters, numbers, dots, and dashes. Every slug can only be used once. This is being used in URLs to refer to your organizer accounts and your events.', unique=True, validators=[django.core.validators.RegexValidator(message='The slug may only contain letters, numbers, dots and dashes.', regex='^[a-zA-Z0-9.-]+$'), pretix.base.validators.OrganizerSlugBanlistValidator()], verbose_name='Short form'), ), migrations.AlterField( model_name='staffsession', diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index cd16a8d63..b47cd32b5 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -22,7 +22,7 @@ from i18nfield.fields import I18nCharField, I18nTextField from pretix.base.models.base import LoggedModel from pretix.base.reldate import RelativeDateWrapper -from pretix.base.validators import EventSlugBlacklistValidator +from pretix.base.validators import EventSlugBanlistValidator from pretix.helpers.database import GroupConcat from pretix.helpers.daterange import daterange from pretix.helpers.json import safe_string @@ -291,7 +291,7 @@ class Event(EventMixin, LoggedModel): regex="^[a-zA-Z0-9.-]+$", message=_("The slug may only contain letters, numbers, dots and dashes."), ), - EventSlugBlacklistValidator() + EventSlugBanlistValidator() ], verbose_name=_("Short form"), ) diff --git a/src/pretix/base/models/organizer.py b/src/pretix/base/models/organizer.py index af4e60a05..5ca7ca8be 100644 --- a/src/pretix/base/models/organizer.py +++ b/src/pretix/base/models/organizer.py @@ -7,7 +7,7 @@ from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from pretix.base.models.base import LoggedModel -from pretix.base.validators import OrganizerSlugBlacklistValidator +from pretix.base.validators import OrganizerSlugBanlistValidator from ..settings import settings_hierarkey from .auth import User @@ -39,7 +39,7 @@ class Organizer(LoggedModel): regex="^[a-zA-Z0-9.-]+$", message=_("The slug may only contain letters, numbers, dots and dashes.") ), - OrganizerSlugBlacklistValidator() + OrganizerSlugBanlistValidator() ], verbose_name=_("Short form"), unique=True diff --git a/src/pretix/base/shredder.py b/src/pretix/base/shredder.py index 85575bfe9..bb6880c0a 100644 --- a/src/pretix/base/shredder.py +++ b/src/pretix/base/shredder.py @@ -106,14 +106,14 @@ class BaseDataShredder: raise NotImplementedError() # NOQA -def shred_log_fields(logentry, blacklist=None, whitelist=None): +def shred_log_fields(logentry, banlist=None, whitelist=None): d = logentry.parsed_data if whitelist: for k, v in d.items(): if k not in whitelist: d[k] = '█' - elif blacklist: - for f in blacklist: + elif banlist: + for f in banlist: if f in d: d[f] = '█' logentry.data = json.dumps(d) @@ -150,10 +150,10 @@ class EmailAddressShredder(BaseDataShredder): o.save(update_fields=['meta_info', 'email']) for le in self.event.logentry_set.filter(action_type__contains="order.email"): - shred_log_fields(le, blacklist=['recipient', 'message', 'subject']) + shred_log_fields(le, banlist=['recipient', 'message', 'subject']) for le in self.event.logentry_set.filter(action_type="pretix.event.order.contact.changed"): - shred_log_fields(le, blacklist=['old_email', 'new_email']) + shred_log_fields(le, banlist=['old_email', 'new_email']) for le in self.event.logentry_set.filter(action_type="pretix.event.order.modified").exclude(data=""): d = le.parsed_data diff --git a/src/pretix/base/validators.py b/src/pretix/base/validators.py index dd492fe4a..1ffb078bd 100644 --- a/src/pretix/base/validators.py +++ b/src/pretix/base/validators.py @@ -4,13 +4,13 @@ from django.utils.deconstruct import deconstructible from django.utils.translation import ugettext_lazy as _ -class BlacklistValidator: +class BanlistValidator: - blacklist = [] + banlist = [] def __call__(self, value): # Validation logic - if value in self.blacklist: + if value in self.banlist: raise ValidationError( _('This field has an invalid value: %(value)s.'), code='invalid', @@ -19,9 +19,9 @@ class BlacklistValidator: @deconstructible -class EventSlugBlacklistValidator(BlacklistValidator): +class EventSlugBanlistValidator(BanlistValidator): - blacklist = [ + banlist = [ 'download', 'healthcheck', 'locale', @@ -39,9 +39,9 @@ class EventSlugBlacklistValidator(BlacklistValidator): @deconstructible -class OrganizerSlugBlacklistValidator(BlacklistValidator): +class OrganizerSlugBanlistValidator(BanlistValidator): - blacklist = [ + banlist = [ 'download', 'healthcheck', 'locale', @@ -60,8 +60,8 @@ class OrganizerSlugBlacklistValidator(BlacklistValidator): @deconstructible -class EmailBlacklistValidator(BlacklistValidator): +class EmailBanlistValidator(BanlistValidator): - blacklist = [ + banlist = [ settings.PRETIX_EMAIL_NONE_VALUE, ] diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py index 57d7e6766..685c0a652 100644 --- a/src/pretix/control/logdisplay.py +++ b/src/pretix/control/logdisplay.py @@ -19,7 +19,7 @@ from pretix.base.models import ( from pretix.base.signals import logentry_display from pretix.base.templatetags.money import money_filter -OVERVIEW_BLACKLIST = [ +OVERVIEW_BANLIST = [ 'pretix.plugins.sendmail.order.email.sent' ] diff --git a/src/pretix/control/views/dashboards.py b/src/pretix/control/views/dashboards.py index 844c82f73..be6efc082 100644 --- a/src/pretix/control/views/dashboards.py +++ b/src/pretix/control/views/dashboards.py @@ -30,7 +30,7 @@ from pretix.control.signals import ( ) from pretix.helpers.daterange import daterange -from ..logdisplay import OVERVIEW_BLACKLIST +from ..logdisplay import OVERVIEW_BANLIST NUM_WIDGET = '
{num}{text}
' @@ -286,7 +286,7 @@ def event_index(request, organizer, event): request=request) qs = request.event.logentry_set.all().select_related('user', 'content_type', 'api_token', 'oauth_application', 'device').order_by('-datetime') - qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST) + qs = qs.exclude(action_type__in=OVERVIEW_BANLIST) if not request.user.has_event_permission(request.organizer, request.event, 'can_view_orders', request=request): qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order)) if not request.user.has_event_permission(request.organizer, request.event, 'can_view_vouchers', request=request): diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index b7326f5fc..3849f4c4d 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -49,7 +49,7 @@ from pretix.multidomain.urlreverse import get_domain from pretix.plugins.stripe.payment import StripeSettingsHolder from pretix.presale.style import regenerate_css -from ..logdisplay import OVERVIEW_BLACKLIST +from ..logdisplay import OVERVIEW_BANLIST from . import CreateView, PaginationMixin, UpdateView @@ -868,7 +868,7 @@ class EventLog(EventPermissionRequiredMixin, ListView): qs = self.request.event.logentry_set.all().select_related( 'user', 'content_type', 'api_token', 'oauth_application', 'device' ).order_by('-datetime') - qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST) + qs = qs.exclude(action_type__in=OVERVIEW_BANLIST) if not self.request.user.has_event_permission(self.request.organizer, self.request.event, 'can_view_orders', request=self.request): qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order)) diff --git a/src/pretix/helpers/metrics/middleware.py b/src/pretix/helpers/metrics/middleware.py index c785b0d82..caba7d63c 100644 --- a/src/pretix/helpers/metrics/middleware.py +++ b/src/pretix/helpers/metrics/middleware.py @@ -6,7 +6,7 @@ from pretix.base.metrics import pretix_view_duration_seconds class MetricsMiddleware(object): - blacklist = ( + banlist = ( '/healthcheck/', '/jsi18n/', '/metrics', @@ -19,7 +19,7 @@ class MetricsMiddleware(object): def __call__(self, request): # Code to be executed for each request before # the view (and later middleware) are called. - for b in self.blacklist: + for b in self.banlist: if b in request.path: return self.get_response(request) diff --git a/src/pretix/helpers/profile/middleware.py b/src/pretix/helpers/profile/middleware.py index 5ee0958aa..b1bbb32e5 100644 --- a/src/pretix/helpers/profile/middleware.py +++ b/src/pretix/helpers/profile/middleware.py @@ -7,7 +7,7 @@ from django.conf import settings class CProfileMiddleware(object): - blacklist = ( + banlist = ( '/healthcheck/', '/jsi18n/' ) @@ -19,7 +19,7 @@ class CProfileMiddleware(object): def __call__(self, request): # Code to be executed for each request before # the view (and later middleware) are called. - for b in self.blacklist: + for b in self.banlist: if b in request.path: return self.get_response(request) diff --git a/src/pretix/presale/forms/checkout.py b/src/pretix/presale/forms/checkout.py index c56687b53..0bedff641 100644 --- a/src/pretix/presale/forms/checkout.py +++ b/src/pretix/presale/forms/checkout.py @@ -18,7 +18,7 @@ from pretix.base.services.cart import CartError, error_messages from pretix.base.signals import validate_cart_addons from pretix.base.templatetags.money import money_filter from pretix.base.templatetags.rich_text import rich_text -from pretix.base.validators import EmailBlacklistValidator +from pretix.base.validators import EmailBanlistValidator from pretix.helpers.templatetags.thumb import thumb from pretix.presale.signals import contact_form_fields @@ -28,7 +28,7 @@ class ContactForm(forms.Form): email = forms.EmailField(label=_('E-mail'), help_text=_('Make sure to enter a valid email address. We will send you an order ' 'confirmation including a link that you need to access your order later.'), - validators=[EmailBlacklistValidator()], + validators=[EmailBanlistValidator()], widget=forms.EmailInput(attrs={'autocomplete': 'section-contact email'}) ) diff --git a/src/tests/presale/test_event.py b/src/tests/presale/test_event.py index 6f2450c78..00784d6a0 100644 --- a/src/tests/presale/test_event.py +++ b/src/tests/presale/test_event.py @@ -1205,7 +1205,7 @@ class EventMicrodataTest(EventTestMixin, SoupTest): self.assertEqual(self.event.date_from.isoformat(), md['startDate'], msg='Date From not present') -class EventSlugBlacklistValidatorTest(EventTestMixin, SoupTest): +class EventSlugBanlistValidatorTest(EventTestMixin, SoupTest): @scopes_disabled() def test_slug_validation(self): event = Event(