Upgrade to Django 3.2 (#2056)

src/pretix/plugins/badges/__init__.py

@@ -19,32 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext, gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class BadgesApp(AppConfig):
-    name = 'pretix.plugins.badges'
-    verbose_name = _("Badges")
-
-    class PretixPluginMeta:
-        name = _("Badges")
-        author = _("the pretix team")
-        version = version
-        category = "FEATURE"
-        description = _("This plugin allows you to generate badges or name tags for your attendees.")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-    def installed(self, event):
-        if not event.badge_layouts.exists():
-            event.badge_layouts.create(
-                name=gettext('Default'),
-                default=True,
-            )
-
-
-default_app_config = 'pretix.plugins.badges.BadgesApp'

src/pretix/plugins/badges/apps.py

@@ -0,0 +1,47 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext, gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class BadgesApp(AppConfig):
+    name = 'pretix.plugins.badges'
+    verbose_name = _("Badges")
+
+    class PretixPluginMeta:
+        name = _("Badges")
+        author = _("the pretix team")
+        version = version
+        category = "FEATURE"
+        description = _("This plugin allows you to generate badges or name tags for your attendees.")
+
+    def ready(self):
+        from . import signals  # NOQA
+
+    def installed(self, event):
+        if not event.badge_layouts.exists():
+            event.badge_layouts.create(
+                name=gettext('Default'),
+                default=True,
+            )

src/pretix/plugins/badges/exporters.py

@@ -41,7 +41,6 @@ from typing import Tuple
 
 import dateutil.parser
 from django import forms
-from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.core.files import File
 from django.core.files.storage import default_storage
@@ -49,7 +48,6 @@ from django.db.models import Exists, OuterRef, Q
 from django.db.models.functions import Coalesce
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _, gettext_lazy
-from jsonfallback.functions import JSONExtract
 from reportlab.lib import pagesizes
 from reportlab.lib.units import mm
 from reportlab.pdfgen import canvas
@@ -60,6 +58,7 @@ from pretix.base.models import Order, OrderPosition
 from pretix.base.pdf import Renderer
 from pretix.base.services.orders import OrderError
 from pretix.base.settings import PERSON_NAME_SCHEMES
+from pretix.helpers.templatetags.jsonfield import JSONExtract
 from pretix.plugins.badges.models import BadgeItem, BadgeLayout
 
 
@@ -297,7 +296,7 @@ class BadgeExporter(BaseExporter):
                      ] + ([
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
-                     ] if settings.JSON_FIELD_AVAILABLE and len(name_scheme['fields']) > 1 else []),
+                     ] if len(name_scheme['fields']) > 1 else []),
                  )),
             ]
         )

src/pretix/plugins/badges/urls.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from pretix.api.urls import event_router
 from pretix.plugins.badges.api import BadgeItemViewSet, BadgeLayoutViewSet
@@ -30,18 +30,18 @@ from .views import (
 )
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/$',
-        LayoutListView.as_view(), name='index'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/print$',
-        OrderPrintDo.as_view(), name='print'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/add$',
-        LayoutCreate.as_view(), name='add'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/default$',
-        LayoutSetDefault.as_view(), name='default'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/delete$',
-        LayoutDelete.as_view(), name='delete'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/editor',
-        LayoutEditorView.as_view(), name='edit'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/$',
+            LayoutListView.as_view(), name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/print$',
+            OrderPrintDo.as_view(), name='print'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/add$',
+            LayoutCreate.as_view(), name='add'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/default$',
+            LayoutSetDefault.as_view(), name='default'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/delete$',
+            LayoutDelete.as_view(), name='delete'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/badges/(?P<layout>\d+)/editor',
+            LayoutEditorView.as_view(), name='edit'),
 ]
 event_router.register('badgelayouts', BadgeLayoutViewSet)
 event_router.register('badgeitems', BadgeItemViewSet)

src/pretix/plugins/banktransfer/__init__.py

@@ -19,38 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class BankTransferApp(AppConfig):
-    name = 'pretix.plugins.banktransfer'
-    verbose_name = _("Bank transfer")
-
-    class PretixPluginMeta:
-        name = _("Bank transfer")
-        author = _("the pretix team")
-        category = 'PAYMENT'
-        version = version
-        description = _("This plugin allows you to receive payments " +
-                        "via bank transfer.")
-
-    def ready(self):
-        from . import signals  # NOQA
-        from . import tasks  # NOQA
-        from .templatetags import commadecimal, dotdecimal  # NOQA
-
-    @cached_property
-    def compatibility_warnings(self):
-        errs = []
-        try:
-            import chardet  # NOQA
-        except ImportError:
-            errs.append(_("Install the python package 'chardet' for better CSV import capabilities."))
-        return errs
-
-
-default_app_config = 'pretix.plugins.banktransfer.BankTransferApp'

src/pretix/plugins/banktransfer/apps.py

@@ -0,0 +1,53 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class BankTransferApp(AppConfig):
+    name = 'pretix.plugins.banktransfer'
+    verbose_name = _("Bank transfer")
+
+    class PretixPluginMeta:
+        name = _("Bank transfer")
+        author = _("the pretix team")
+        category = 'PAYMENT'
+        version = version
+        description = _("This plugin allows you to receive payments " +
+                        "via bank transfer.")
+
+    def ready(self):
+        from . import signals  # NOQA
+        from . import tasks  # NOQA
+        from .templatetags import commadecimal, dotdecimal  # NOQA
+
+    @cached_property
+    def compatibility_warnings(self):
+        errs = []
+        try:
+            import chardet  # NOQA
+        except ImportError:
+            errs.append(_("Install the python package 'chardet' for better CSV import capabilities."))
+        return errs

src/pretix/plugins/banktransfer/urls.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from pretix.api.urls import orga_router
 from pretix.plugins.banktransfer.api import BankImportJobViewSet
@@ -27,38 +27,38 @@ from pretix.plugins.banktransfer.api import BankImportJobViewSet
 from . import views
 
 urlpatterns = [
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/import/',
-        views.OrganizerImportView.as_view(),
-        name='import'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/job/(?P<job>\d+)/',
-        views.OrganizerJobDetailView.as_view(), name='import.job'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/action/',
-        views.OrganizerActionView.as_view(), name='import.action'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/refunds/',
-        views.OrganizerRefundExportListView.as_view(), name='refunds.list'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
-        views.OrganizerDownloadRefundExportView.as_view(),
-        name='refunds.download'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
-        views.OrganizerSepaXMLExportView.as_view(),
-        name='refunds.sepa'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/import/',
+            views.OrganizerImportView.as_view(),
+            name='import'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/job/(?P<job>\d+)/',
+            views.OrganizerJobDetailView.as_view(), name='import.job'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/action/',
+            views.OrganizerActionView.as_view(), name='import.action'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/refunds/',
+            views.OrganizerRefundExportListView.as_view(), name='refunds.list'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
+            views.OrganizerDownloadRefundExportView.as_view(),
+            name='refunds.download'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
+            views.OrganizerSepaXMLExportView.as_view(),
+            name='refunds.sepa'),
 
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/import/',
-        views.EventImportView.as_view(),
-        name='import'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/job/(?P<job>\d+)/',
-        views.EventJobDetailView.as_view(), name='import.job'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/action/',
-        views.EventActionView.as_view(), name='import.action'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/refunds/',
-        views.EventRefundExportListView.as_view(),
-        name='refunds.list'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
-        views.EventDownloadRefundExportView.as_view(),
-        name='refunds.download'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
-        views.EventSepaXMLExportView.as_view(),
-        name='refunds.sepa'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/import/',
+            views.EventImportView.as_view(),
+            name='import'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/job/(?P<job>\d+)/',
+            views.EventJobDetailView.as_view(), name='import.job'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/action/',
+            views.EventActionView.as_view(), name='import.action'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/refunds/',
+            views.EventRefundExportListView.as_view(),
+            name='refunds.list'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/export/(?P<id>\d+)/$',
+            views.EventDownloadRefundExportView.as_view(),
+            name='refunds.download'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/sepa-export/(?P<id>\d+)/$',
+            views.EventSepaXMLExportView.as_view(),
+            name='refunds.sepa'),
 ]
 
 orga_router.register('bankimportjobs', BankImportJobViewSet)

src/pretix/plugins/checkinlists/__init__.py

@@ -31,36 +31,3 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-
-from django.apps import AppConfig
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class CheckinlistsApp(AppConfig):
-    name = 'pretix.plugins.checkinlists'
-    verbose_name = _("Check-in lists")
-
-    class PretixPluginMeta:
-        name = _("Check-in list exporter")
-        author = _("the pretix team")
-        version = version
-        visible = False
-        description = _("This plugin allows you to generate check-in lists for your conference.")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-    @cached_property
-    def compatibility_errors(self):
-        errs = []
-        try:
-            import reportlab  # NOQA
-        except ImportError:
-            errs.append("Python package 'reportlab' is not installed.")
-        return errs
-
-
-default_app_config = 'pretix.plugins.checkinlists.CheckinlistsApp'

src/pretix/plugins/checkinlists/apps.py

@@ -0,0 +1,63 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
+# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
+# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
+#
+# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under the License.
+
+from django.apps import AppConfig
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class CheckinlistsApp(AppConfig):
+    name = 'pretix.plugins.checkinlists'
+    verbose_name = _("Check-in lists")
+
+    class PretixPluginMeta:
+        name = _("Check-in list exporter")
+        author = _("the pretix team")
+        version = version
+        visible = False
+        description = _("This plugin allows you to generate check-in lists for your conference.")
+
+    def ready(self):
+        from . import signals  # NOQA
+
+    @cached_property
+    def compatibility_errors(self):
+        errs = []
+        try:
+            import reportlab  # NOQA
+        except ImportError:
+            errs.append("Python package 'reportlab' is not installed.")
+        return errs

src/pretix/plugins/checkinlists/exporters.py

@@ -37,7 +37,6 @@ from datetime import datetime, time, timedelta
 
 import dateutil.parser
 from django import forms
-from django.conf import settings
 from django.db.models import (
     Case, Exists, Max, OuterRef, Q, Subquery, Value, When,
 )
@@ -46,7 +45,6 @@ from django.urls import reverse
 from django.utils.formats import date_format
 from django.utils.timezone import is_aware, make_aware
 from django.utils.translation import gettext as _, gettext_lazy, pgettext
-from jsonfallback.functions import JSONExtract
 from pytz import UTC
 from reportlab.lib.units import mm
 from reportlab.platypus import Flowable, Paragraph, Spacer, Table, TableStyle
@@ -58,6 +56,7 @@ from pretix.base.models import (
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.templatetags.money import money_filter
 from pretix.control.forms.widgets import Select2
+from pretix.helpers.templatetags.jsonfield import JSONExtract
 from pretix.plugins.reports.exporters import ReportlabExportMixin
 
 
@@ -110,7 +109,7 @@ class CheckInListMixin(BaseExporter):
                      ] + ([
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
-                     ] if settings.JSON_FIELD_AVAILABLE and len(name_scheme['fields']) > 1 else []),
+                     ] if len(name_scheme['fields']) > 1 else []),
                      widget=forms.RadioSelect,
                      required=False
                  )),

src/pretix/plugins/manualpayment/__init__.py

@@ -19,22 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class ManualPaymentApp(AppConfig):
-    name = 'pretix.plugins.manualpayment'
-    verbose_name = _("Manual payment")
-
-    class PretixPluginMeta:
-        name = _("Manual payment")
-        author = _("the pretix team")
-        version = version
-        category = 'PAYMENT'
-        description = _("This plugin adds a customizable payment method for manual processing.")
-
-
-default_app_config = 'pretix.plugins.manualpayment.ManualPaymentApp'

src/pretix/plugins/manualpayment/apps.py

@@ -0,0 +1,37 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class ManualPaymentApp(AppConfig):
+    name = 'pretix.plugins.manualpayment'
+    verbose_name = _("Manual payment")
+
+    class PretixPluginMeta:
+        name = _("Manual payment")
+        author = _("the pretix team")
+        version = version
+        category = 'PAYMENT'
+        description = _("This plugin adds a customizable payment method for manual processing.")

src/pretix/plugins/paypal/__init__.py

@@ -31,36 +31,3 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-
-from django.apps import AppConfig
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class PaypalApp(AppConfig):
-    name = 'pretix.plugins.paypal'
-    verbose_name = _("PayPal")
-
-    class PretixPluginMeta:
-        name = _("PayPal")
-        author = _("the pretix team")
-        version = version
-        category = 'PAYMENT'
-        description = _("This plugin allows you to receive payments via PayPal")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-    @cached_property
-    def compatibility_errors(self):
-        errs = []
-        try:
-            import paypalrestsdk  # NOQA
-        except ImportError:
-            errs.append("Python package 'paypalrestsdk' is not installed.")
-        return errs
-
-
-default_app_config = 'pretix.plugins.paypal.PaypalApp'

src/pretix/plugins/paypal/apps.py

@@ -0,0 +1,63 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
+# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
+# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
+#
+# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under the License.
+
+from django.apps import AppConfig
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class PaypalApp(AppConfig):
+    name = 'pretix.plugins.paypal'
+    verbose_name = _("PayPal")
+
+    class PretixPluginMeta:
+        name = _("PayPal")
+        author = _("the pretix team")
+        version = version
+        category = 'PAYMENT'
+        description = _("This plugin allows you to receive payments via PayPal")
+
+    def ready(self):
+        from . import signals  # NOQA
+
+    @cached_property
+    def compatibility_errors(self):
+        errs = []
+        try:
+            import paypalrestsdk  # NOQA
+        except ImportError:
+            errs.append("Python package 'paypalrestsdk' is not installed.")
+        return errs

src/pretix/plugins/paypal/urls.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 
 from pretix.multidomain import event_url
 
@@ -28,22 +28,21 @@ from .views import (
 )
 
 event_patterns = [
-    url(r'^paypal/', include([
-        url(r'^abort/$', abort, name='abort'),
-        url(r'^return/$', success, name='return'),
-        url(r'^redirect/$', redirect_view, name='redirect'),
+    re_path(r'^paypal/', include([
+        re_path(r'^abort/$', abort, name='abort'),
+        re_path(r'^return/$', success, name='return'),
+        re_path(r'^redirect/$', redirect_view, name='redirect'),
 
-        url(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/abort/', abort, name='abort'),
-        url(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/return/', success, name='return'),
+        re_path(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/abort/', abort, name='abort'),
+        re_path(r'w/(?P<cart_namespace>[a-zA-Z0-9]{16})/return/', success, name='return'),
 
         event_url(r'^webhook/$', webhook, name='webhook', require_live=False),
     ])),
 ]
 
-
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/paypal/disconnect/',
-        oauth_disconnect, name='oauth.disconnect'),
-    url(r'^_paypal/webhook/$', webhook, name='webhook'),
-    url(r'^_paypal/oauth_return/$', oauth_return, name='oauth.return'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/paypal/disconnect/',
+            oauth_disconnect, name='oauth.disconnect'),
+    re_path(r'^_paypal/webhook/$', webhook, name='webhook'),
+    re_path(r'^_paypal/oauth_return/$', oauth_return, name='oauth.return'),
 ]

src/pretix/plugins/pretixdroid/__init__.py

@@ -19,24 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class PretixdroidApp(AppConfig):
-    name = 'pretix.plugins.pretixdroid'
-    verbose_name = _("Old check-in device API")
-
-    class PretixPluginMeta:
-        name = _("Old check-in device API")
-        author = _("the pretix team")
-        version = version
-        visible = False
-        restricted = True
-        category = 'INTEGRATION'
-        description = _("This plugin allows you to use the pretixdroid and pretixdesk apps for your event.")
-
-
-default_app_config = 'pretix.plugins.pretixdroid.PretixdroidApp'

src/pretix/plugins/pretixdroid/apps.py

@@ -0,0 +1,39 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class PretixdroidApp(AppConfig):
+    name = 'pretix.plugins.pretixdroid'
+    verbose_name = _("Old check-in device API")
+
+    class PretixPluginMeta:
+        name = _("Old check-in device API")
+        author = _("the pretix team")
+        version = version
+        visible = False
+        restricted = True
+        category = 'INTEGRATION'
+        description = _("This plugin allows you to use the pretixdroid and pretixdesk apps for your event.")

src/pretix/plugins/reports/__init__.py

@@ -31,36 +31,3 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-
-from django.apps import AppConfig
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class ReportsApp(AppConfig):
-    name = 'pretix.plugins.reports'
-    verbose_name = _("Report exporter")
-
-    class PretixPluginMeta:
-        name = _("Report exporter")
-        author = _("the pretix team")
-        version = version
-        category = 'FORMAT'
-        description = _("This plugin allows you to generate printable reports about your sales.")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-    @cached_property
-    def compatibility_errors(self):
-        errs = []
-        try:
-            import reportlab  # NOQA
-        except ImportError:
-            errs.append("Python package 'reportlab' is not installed.")
-        return errs
-
-
-default_app_config = 'pretix.plugins.reports.ReportsApp'

src/pretix/plugins/reports/apps.py

@@ -0,0 +1,63 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
+# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
+# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
+#
+# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under the License.
+
+from django.apps import AppConfig
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class ReportsApp(AppConfig):
+    name = 'pretix.plugins.reports'
+    verbose_name = _("Report exporter")
+
+    class PretixPluginMeta:
+        name = _("Report exporter")
+        author = _("the pretix team")
+        version = version
+        category = 'FORMAT'
+        description = _("This plugin allows you to generate printable reports about your sales.")
+
+    def ready(self):
+        from . import signals  # NOQA
+
+    @cached_property
+    def compatibility_errors(self):
+        errs = []
+        try:
+            import reportlab  # NOQA
+        except ImportError:
+            errs.append("Python package 'reportlab' is not installed.")
+        return errs

src/pretix/plugins/returnurl/__init__.py

@@ -19,26 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class ReturnURLApp(AppConfig):
-    name = 'pretix.plugins.returnurl'
-    verbose_name = _("Redirection from order page")
-
-    class PretixPluginMeta:
-        name = _("Redirection from order page")
-        author = _("the pretix team")
-        version = version
-        category = 'API'
-        description = _("This plugin allows to link to payments and redirect back afterwards. This is useful in "
-                        "combination with our API.")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-
-default_app_config = 'pretix.plugins.returnurl.ReturnURLApp'

src/pretix/plugins/returnurl/apps.py

@@ -0,0 +1,41 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class ReturnURLApp(AppConfig):
+    name = 'pretix.plugins.returnurl'
+    verbose_name = _("Redirection from order page")
+
+    class PretixPluginMeta:
+        name = _("Redirection from order page")
+        author = _("the pretix team")
+        version = version
+        category = 'API'
+        description = _("This plugin allows to link to payments and redirect back afterwards. This is useful in "
+                        "combination with our API.")
+
+    def ready(self):
+        from . import signals  # NOQA

src/pretix/plugins/returnurl/urls.py

@@ -19,11 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from .views import ReturnSettings
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/returnurl/settings$',
-        ReturnSettings.as_view(), name='settings'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/returnurl/settings$',
+            ReturnSettings.as_view(), name='settings'),
 ]

src/pretix/plugins/sendmail/__init__.py

@@ -19,27 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class SendMailApp(AppConfig):
-    name = 'pretix.plugins.sendmail'
-    verbose_name = _("Send out emails")
-
-    class PretixPluginMeta:
-        name = _("Send out emails")
-        author = _("the pretix team")
-        category = 'FEATURE'
-        version = version
-        description = _("This plugin allows you to send out emails " +
-                        "to all your customers.")
-
-    def ready(self):
-        from . import signals  # NOQA
-        from . import tasks  # NOQA
-
-
-default_app_config = 'pretix.plugins.sendmail.SendMailApp'

src/pretix/plugins/sendmail/apps.py

@@ -0,0 +1,42 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class SendMailApp(AppConfig):
+    name = 'pretix.plugins.sendmail'
+    verbose_name = _("Send out emails")
+
+    class PretixPluginMeta:
+        name = _("Send out emails")
+        author = _("the pretix team")
+        category = 'FEATURE'
+        version = version
+        description = _("This plugin allows you to send out emails " +
+                        "to all your customers.")
+
+    def ready(self):
+        from . import signals  # NOQA
+        from . import tasks  # NOQA

src/pretix/plugins/sendmail/urls.py

@@ -32,12 +32,12 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from . import views
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/$', views.SenderView.as_view(),
-        name='send'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/history/', views.EmailHistoryView.as_view(), name='history')
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/$', views.SenderView.as_view(),
+            name='send'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/sendmail/history/', views.EmailHistoryView.as_view(), name='history')
 ]

src/pretix/plugins/statistics/__init__.py

@@ -19,25 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class StatisticsApp(AppConfig):
-    name = 'pretix.plugins.statistics'
-    verbose_name = _("Statistics")
-
-    class PretixPluginMeta:
-        name = _("Statistics")
-        author = _("the pretix team")
-        version = version
-        category = 'FEATURE'
-        description = _("This plugin shows you various statistics.")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-
-default_app_config = 'pretix.plugins.statistics.StatisticsApp'

src/pretix/plugins/statistics/apps.py

@@ -0,0 +1,40 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class StatisticsApp(AppConfig):
+    name = 'pretix.plugins.statistics'
+    verbose_name = _("Statistics")
+
+    class PretixPluginMeta:
+        name = _("Statistics")
+        author = _("the pretix team")
+        version = version
+        category = 'FEATURE'
+        description = _("This plugin shows you various statistics.")
+
+    def ready(self):
+        from . import signals  # NOQA

src/pretix/plugins/statistics/urls.py

@@ -19,11 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from . import views
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/statistics/', views.IndexView.as_view(),
-        name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/statistics/', views.IndexView.as_view(),
+            name='index'),
 ]

src/pretix/plugins/stripe/__init__.py

@@ -19,36 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class StripeApp(AppConfig):
-    name = 'pretix.plugins.stripe'
-    verbose_name = _("Stripe")
-
-    class PretixPluginMeta:
-        name = _("Stripe")
-        author = _("the pretix team")
-        version = version
-        category = 'PAYMENT'
-        description = _("This plugin allows you to receive credit card payments " +
-                        "via Stripe")
-
-    def ready(self):
-        from . import signals, tasks  # NOQA
-
-    @cached_property
-    def compatibility_errors(self):
-        errs = []
-        try:
-            import stripe  # NOQA
-        except ImportError:
-            errs.append("Python package 'stripe' is not installed.")
-        return errs
-
-
-default_app_config = 'pretix.plugins.stripe.StripeApp'

src/pretix/plugins/stripe/apps.py

@@ -0,0 +1,51 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class StripeApp(AppConfig):
+    name = 'pretix.plugins.stripe'
+    verbose_name = _("Stripe")
+
+    class PretixPluginMeta:
+        name = _("Stripe")
+        author = _("the pretix team")
+        version = version
+        category = 'PAYMENT'
+        description = _("This plugin allows you to receive credit card payments " +
+                        "via Stripe")
+
+    def ready(self):
+        from . import signals, tasks  # NOQA
+
+    @cached_property
+    def compatibility_errors(self):
+        errs = []
+        try:
+            import stripe  # NOQA
+        except ImportError:
+            errs.append("Python package 'stripe' is not installed.")
+        return errs

src/pretix/plugins/stripe/urls.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 
 from pretix.multidomain import event_url
 
@@ -30,30 +30,30 @@ from .views import (
 )
 
 event_patterns = [
-    url(r'^stripe/', include([
+    re_path(r'^stripe/', include([
         event_url(r'^webhook/$', webhook, name='webhook', require_live=False),
-        url(r'^redirect/$', redirect_view, name='redirect'),
-        url(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'),
-        url(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ScaView.as_view(), name='sca'),
-        url(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/return/$',
-            ScaReturnView.as_view(), name='sca.return'),
+        re_path(r'^redirect/$', redirect_view, name='redirect'),
+        re_path(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'),
+        re_path(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ScaView.as_view(), name='sca'),
+        re_path(r'^sca/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/return/$',
+                ScaReturnView.as_view(), name='sca.return'),
     ])),
-    url(r'^.well-known/apple-developer-merchantid-domain-association$',
-        applepay_association, name='applepay.association'),
+    re_path(r'^.well-known/apple-developer-merchantid-domain-association$',
+            applepay_association, name='applepay.association'),
 ]
 
 organizer_patterns = [
-    url(r'^.well-known/apple-developer-merchantid-domain-association$',
-        applepay_association, name='applepay.association'),
+    re_path(r'^.well-known/apple-developer-merchantid-domain-association$',
+            applepay_association, name='applepay.association'),
 ]
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/stripe/disconnect/',
-        oauth_disconnect, name='oauth.disconnect'),
-    url(r'^control/organizer/(?P<organizer>[^/]+)/stripeconnect/',
-        OrganizerSettingsFormView.as_view(), name='settings.connect'),
-    url(r'^_stripe/webhook/$', webhook, name='webhook'),
-    url(r'^_stripe/oauth_return/$', oauth_return, name='oauth.return'),
-    url(r'^.well-known/apple-developer-merchantid-domain-association$',
-        applepay_association, name='applepay.association'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/stripe/disconnect/',
+            oauth_disconnect, name='oauth.disconnect'),
+    re_path(r'^control/organizer/(?P<organizer>[^/]+)/stripeconnect/',
+            OrganizerSettingsFormView.as_view(), name='settings.connect'),
+    re_path(r'^_stripe/webhook/$', webhook, name='webhook'),
+    re_path(r'^_stripe/oauth_return/$', oauth_return, name='oauth.return'),
+    re_path(r'^.well-known/apple-developer-merchantid-domain-association$',
+            applepay_association, name='applepay.association'),
 ]

src/pretix/plugins/ticketoutputpdf/__init__.py

@@ -31,36 +31,3 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-
-from django.apps import AppConfig
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class TicketOutputPdfApp(AppConfig):
-    name = 'pretix.plugins.ticketoutputpdf'
-    verbose_name = _("PDF ticket output")
-
-    class PretixPluginMeta:
-        name = _("PDF ticket output")
-        author = _("the pretix team")
-        version = version
-        category = 'FORMAT'
-        description = _("This plugin allows you to print out tickets as PDF files")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-    @cached_property
-    def compatibility_errors(self):
-        errs = []
-        try:
-            import reportlab  # NOQA
-        except ImportError:
-            errs.append("Python package 'reportlab' is not installed.")
-        return errs
-
-
-default_app_config = 'pretix.plugins.ticketoutputpdf.TicketOutputPdfApp'

src/pretix/plugins/ticketoutputpdf/apps.py

@@ -0,0 +1,63 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
+# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
+# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
+#
+# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under the License.
+
+from django.apps import AppConfig
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class TicketOutputPdfApp(AppConfig):
+    name = 'pretix.plugins.ticketoutputpdf'
+    verbose_name = _("PDF ticket output")
+
+    class PretixPluginMeta:
+        name = _("PDF ticket output")
+        author = _("the pretix team")
+        version = version
+        category = 'FORMAT'
+        description = _("This plugin allows you to print out tickets as PDF files")
+
+    def ready(self):
+        from . import signals  # NOQA
+
+    @cached_property
+    def compatibility_errors(self):
+        errs = []
+        try:
+            import reportlab  # NOQA
+        except ImportError:
+            errs.append("Python package 'reportlab' is not installed.")
+        return errs

src/pretix/plugins/ticketoutputpdf/exporters.py

@@ -38,13 +38,11 @@ from io import BytesIO
 
 import dateutil.parser
 from django import forms
-from django.conf import settings
 from django.core.files.base import ContentFile
 from django.db.models import Q
 from django.db.models.functions import Coalesce
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _, gettext_lazy
-from jsonfallback.functions import JSONExtract
 from PyPDF2.merger import PdfFileMerger
 
 from pretix.base.exporter import BaseExporter
@@ -52,6 +50,7 @@ from pretix.base.i18n import language
 from pretix.base.models import Event, Order, OrderPosition
 from pretix.base.settings import PERSON_NAME_SCHEMES
 
+from ...helpers.templatetags.jsonfield import JSONExtract
 from .ticketoutput import PdfTicketOutput
 
 
@@ -94,7 +93,7 @@ class AllTicketsPDF(BaseExporter):
                      ] + ([
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
-                     ] if settings.JSON_FIELD_AVAILABLE and name_scheme and len(name_scheme['fields']) > 1 else []),
+                     ] if name_scheme and len(name_scheme['fields']) > 1 else []),
                  )),
             ]
         )

src/pretix/plugins/ticketoutputpdf/signals.py

@@ -152,10 +152,10 @@ def pdf_logentry_object_link(sender, logentry, **kwargs):
     return a_text.format_map(a_map)
 
 
-override_layout = EventPluginSignal(
-    providing_args=["layout", "orderposition"]
-)
+override_layout = EventPluginSignal()
 """
+Arguments: ``layout``, ``orderposition``
+
 This signal allows you to forcefully override the ticket layout that is being used to create the ticket PDF. Use with
 care, as this will render any specifically by the organizer selected templates useless.
 

src/pretix/plugins/ticketoutputpdf/urls.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from pretix.api.urls import event_router
 from pretix.plugins.ticketoutputpdf.api import (
@@ -31,18 +31,18 @@ from pretix.plugins.ticketoutputpdf.views import (
 )
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/$',
-        LayoutListView.as_view(), name='index'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/add$',
-        LayoutCreate.as_view(), name='add'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/default$',
-        LayoutSetDefault.as_view(), name='default'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/default$',
-        LayoutGetDefault.as_view(), name='getdefault'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/delete$',
-        LayoutDelete.as_view(), name='delete'),
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/editor',
-        LayoutEditorView.as_view(), name='edit'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/$',
+            LayoutListView.as_view(), name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/add$',
+            LayoutCreate.as_view(), name='add'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/default$',
+            LayoutSetDefault.as_view(), name='default'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/default$',
+            LayoutGetDefault.as_view(), name='getdefault'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/delete$',
+            LayoutDelete.as_view(), name='delete'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/pdfoutput/(?P<layout>\d+)/editor',
+            LayoutEditorView.as_view(), name='edit'),
 ]
 event_router.register('ticketlayouts', TicketLayoutViewSet)
 event_router.register('ticketlayoutitems', TicketLayoutItemViewSet)

src/pretix/plugins/webcheckin/__init__.py

@@ -19,25 +19,3 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class WebCheckinApp(AppConfig):
-    name = 'pretix.plugins.webcheckin'
-    verbose_name = _("Web-based check-in")
-
-    class PretixPluginMeta:
-        name = _("Web-based check-in")
-        author = _("the pretix team")
-        version = version
-        category = "FEATURE"
-        description = _("This plugin allows you to perform check-in actions in your browser.")
-
-    def ready(self):
-        from . import signals  # NOQA
-
-
-default_app_config = 'pretix.plugins.webcheckin.WebCheckinApp'

src/pretix/plugins/webcheckin/apps.py

@@ -0,0 +1,40 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from pretix import __version__ as version
+
+
+class WebCheckinApp(AppConfig):
+    name = 'pretix.plugins.webcheckin'
+    verbose_name = _("Web-based check-in")
+
+    class PretixPluginMeta:
+        name = _("Web-based check-in")
+        author = _("the pretix team")
+        version = version
+        category = "FEATURE"
+        description = _("This plugin allows you to perform check-in actions in your browser.")
+
+    def ready(self):
+        from . import signals  # NOQA

src/pretix/plugins/webcheckin/urls.py

@@ -19,11 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from .views import IndexView
 
 urlpatterns = [
-    url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/webcheckin/$',
-        IndexView.as_view(), name='index'),
+    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/webcheckin/$',
+            IndexView.as_view(), name='index'),
 ]