CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump versions of pycodestyle and pep8-naming

Browse Source
This commit is contained in:
Raphael Michel
2022-02-13 20:39:31 +01:00
parent a307cf8934
commit a37ed6f001
16 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/management/commands/check_order_transactions.py
View File

@@ -104,4 +104,4 @@ class Command(BaseCommand):
print(f"Error in order {o.full_code}: status={o.status}, sum(positions)+sum(fees)={o.position_total + o.fee_total}, "
f"order.total={o.total}, sum(transactions)={o.tx_total}, expected={o.correct_total}, pos_cnt={o.position_cnt}, tx_pos_cnt={o.tx_cnt}")
self.stderr.write(self.style.SUCCESS(f'Check completed.'))
self.stderr.write(self.style.SUCCESS('Check completed.'))

2
src/pretix/base/models/checkin.py
View File

@@ -221,7 +221,7 @@ class CheckinList(LoggedModel):
return rules
if operator in ('or', 'and') and seen_nonbool:
raise ValidationError(f'You cannot use OR/AND logic on a level below a comparison operator.')
raise ValidationError('You cannot use OR/AND logic on a level below a comparison operator.')
for v in values:
cls.validate_rules(v, seen_nonbool=seen_nonbool or operator not in ('or', 'and'), depth=depth + 1)

20
src/pretix/base/services/checkin.py
View File

@@ -373,22 +373,22 @@ class SQLLogic:
).astimezone(pytz.UTC))
elif values[0] == 'date_from':
return Coalesce(
F(f'subevent__date_from'),
F(f'order__event__date_from'),
F('subevent__date_from'),
F('order__event__date_from'),
)
elif values[0] == 'date_to':
return Coalesce(
F(f'subevent__date_to'),
F(f'subevent__date_from'),
F(f'order__event__date_to'),
F(f'order__event__date_from'),
F('subevent__date_to'),
F('subevent__date_from'),
F('order__event__date_to'),
F('order__event__date_from'),
)
elif values[0] == 'date_admission':
return Coalesce(
F(f'subevent__date_admission'),
F(f'subevent__date_from'),
F(f'order__event__date_admission'),
F(f'order__event__date_from'),
F('subevent__date_admission'),
F('subevent__date_from'),
F('order__event__date_admission'),
F('order__event__date_from'),
)
else:
raise ValueError(f'Unknown time type {values[0]}')

2
src/pretix/control/views/subevents.py
View File

@@ -1470,7 +1470,7 @@ class SubEventBulkEdit(SubEventQueryMixin, EventPermissionRequiredMixin, FormVie
form.is_valid() and
self.quota_formset.is_valid() and
(not self.list_formset or self.list_formset.is_valid()) and
all(f.is_valid() for f in self.itemvar_forms)and
all(f.is_valid() for f in self.itemvar_forms) and
all(f.is_valid() for f in self.meta_forms)
)
if is_valid:

2
src/pretix/presale/ical.py
View File

@@ -156,7 +156,7 @@ def get_private_icals(event, positions):
vevent.add('uid').value = 'pretix-{}-{}-{}@{}'.format(
event.organizer.slug,
event.organizer.slug, event.slug,
event.slug,
ev.pk if not isinstance(ev, Event) else '0',
urlparse(url).netloc
)