Merge branch 'development' into dependabot/pip/pycryptodome-3.18.0

Author: norbusan

app/api/access_codes.py

@@ -59,7 +59,7 @@ def before_create_object(self, data, view_kwargs):
                 except NoResultFound:
                     raise ConflictError(
                         {'pointer': '/data/relationships/tickets'},
-                        "Ticket with id {} does not exists".format(str(ticket)),
+                        f"Ticket with id {str(ticket)} does not exists",
                     )
 
     schema = AccessCodeSchema

app/api/chat/rocket_chat.py

@@ -2,6 +2,7 @@
 import random
 import string
 from dataclasses import dataclass
+from typing import Optional
 
 import requests
 
@@ -10,7 +11,6 @@
 from app.models.event import Event
 from app.models.user import User
 from app.settings import get_settings
-from typing import Optional
 
 logger = logging.getLogger(__name__)
 

app/api/custom/invoices.py

@@ -34,9 +34,7 @@ def event_invoices(invoice_identifier):
         raise ForbiddenError({'source': ''}, 'Unauthorized Access')
     key = UPLOAD_PATHS['pdf']['event_invoices'].format(identifier=invoice_identifier)
     file_path = (
-        '../generated/invoices/{}/{}/'.format(key, generate_hash(key))
-        + invoice_identifier
-        + '.pdf'
+        f'../generated/invoices/{key}/{generate_hash(key)}/{invoice_identifier}.pdf'
     )
     try:
         return return_file('event-invoice', file_path, invoice_identifier)

app/api/custom/orders.py

@@ -1,8 +1,6 @@
 import os
-
 from datetime import datetime
 
-
 from flask import Blueprint, jsonify, make_response, request
 from flask.helpers import send_from_directory
 from flask_jwt_extended import current_user, jwt_required
@@ -17,17 +15,15 @@
     create_pdf_tickets_for_holder,
     on_order_completed,
 )
+from app.api.helpers.payment import StripePaymentsManager
 from app.api.helpers.permission_manager import has_access
 from app.api.orders import validate_attendees
 from app.api.schema.orders import OrderSchema
 from app.extensions.limiter import limiter
 from app.models import db
-from app.models.order import Order
-from app.models.order import OrderTicket
+from app.models.order import Order, OrderTicket
 from app.models.ticket import Ticket
 from app.models.ticket_holder import TicketHolder
-from app.api.helpers.payment import StripePaymentsManager
-
 
 order_blueprint = Blueprint('order_blueprint', __name__, url_prefix='/v1/orders')
 ticket_blueprint = Blueprint('ticket_blueprint', __name__, url_prefix='/v1/tickets')

app/api/groups.py

@@ -1,9 +1,6 @@
-from app.models.role import Role
-from app.models.user import User
 from flask import request
 from flask_jwt_extended import current_user
 from flask_rest_jsonapi import ResourceDetail, ResourceList, ResourceRelationship
-from flask_rest_jsonapi.exceptions import ObjectNotFound
 
 from app.api.bootstrap import api
 from app.api.helpers.db import safe_query_kwargs
@@ -16,6 +13,8 @@
 from app.models import db
 from app.models.event import Event
 from app.models.group import Group
+from app.models.role import Role
+from app.models.user import User
 from app.models.user_follow_group import UserFollowGroup
 from app.models.users_groups_role import UsersGroupsRoles
 

app/api/helpers/calendar/ical.py

@@ -1,13 +1,13 @@
 from urllib.parse import quote
 
 import pytz
-from app.api.helpers.utilities import remove_html_tags
 from flask import jsonify
 from flask_jwt_extended import current_user
 from icalendar import Calendar, Event, Timezone
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 
+from app.api.helpers.utilities import remove_html_tags
 from app.models.session import Session
 
 

app/api/helpers/mail.py

@@ -2,10 +2,12 @@
 import datetime
 import logging
 import os
-import pytz
 from itertools import groupby
 from typing import Dict, Optional
 
+import pytz
+from babel.dates import format_date, format_datetime, format_time
+from babel.numbers import format_currency
 from flask import current_app, render_template
 from sqlalchemy.orm import joinedload
 
@@ -17,12 +19,10 @@
 from app.models.event import Event
 from app.models.mail import Mail
 from app.models.message_setting import MessageSettings
+from app.models.order import OrderTicket
 from app.models.ticket_holder import TicketHolder
 from app.models.user import User
 from app.settings import get_settings
-from app.models.order import OrderTicket
-from babel.dates import format_date, format_time, format_datetime
-from babel.numbers import format_currency
 
 logger = logging.getLogger(__name__)
 # pytype: disable=attribute-error

app/api/helpers/order.py

@@ -12,21 +12,21 @@
 from app.api.helpers.errors import ConflictError, UnprocessableEntityError
 from app.api.helpers.files import create_save_pdf
 from app.api.helpers.mail import (
+    convert_to_user_locale,
     send_email_to_attendees,
     send_order_purchase_organizer_email,
 )
 from app.api.helpers.notification import (
     notify_ticket_purchase_attendee,
     notify_ticket_purchase_organizer,
 )
-from app.api.helpers.mail import convert_to_user_locale
 from app.api.helpers.storage import UPLOAD_PATHS
 from app.models import db
 from app.models.order import OrderTicket
+from app.models.setting import Setting
 from app.models.ticket import Ticket
 from app.models.ticket_fee import TicketFees
 from app.models.ticket_holder import TicketHolder
-from app.models.setting import Setting
 from app.settings import get_settings
 
 

app/api/helpers/pentabarfxml.py

@@ -16,7 +16,7 @@
 def format_timedelta(td):
     hours, remainder = divmod(td.total_seconds(), 3600)
     minutes, _ = divmod(remainder, 60)
-    return '{:02}:{:02}'.format(int(hours), int(minutes))
+    return f'{int(hours):02}:{int(minutes):02}'
 
 
 class PentabarfExporter:

app/api/schema/events.py

@@ -1,4 +1,3 @@
-from email.policy import default
 import pytz
 from flask_rest_jsonapi.exceptions import ObjectNotFound
 from marshmallow import validate, validates_schema