Merge pull request #8913 from norbusan/black-formatting

Format using black

Author: mariobehling

app/api/attendees.py

@@ -225,9 +225,7 @@ def before_update_object(self, obj, data, kwargs):
                 'Only admin or that user itself can update attendee info',
             )
 
-        if order.status != 'initializing' and (
-            'checkin_times' not in data
-        ):
+        if order.status != 'initializing' and ('checkin_times' not in data):
             raise UnprocessableEntityError(
                 {'pointer': '/data/id'},
                 "Attendee can't be updated because the corresponding order is not in initializing state",

app/api/custom/invoices.py

@@ -56,14 +56,11 @@ def order_invoices(order_identifier):
             order = Order.query.filter_by(identifier=order_identifier).first()
         except NoResultFound:
             raise NotFoundError({'source': ''}, 'Order Invoice not found')
-        if (
-            has_access(
-                'is_coorganizer_or_user_itself',
-                event_id=order.event_id,
-                user_id=order.user_id,
-            )
-            or order.is_attendee(current_user)
-        ):
+        if has_access(
+            'is_coorganizer_or_user_itself',
+            event_id=order.event_id,
+            user_id=order.user_id,
+        ) or order.is_attendee(current_user):
             file_path = order.invoice_pdf_path
             if not os.path.isfile(file_path):
                 create_pdf_tickets_for_holder(order)

app/api/custom/orders.py

@@ -12,7 +12,11 @@
 from app.api.helpers.db import safe_query, save_to_db
 from app.api.helpers.errors import ForbiddenError, NotFoundError, UnprocessableEntityError
 from app.api.helpers.mail import send_email_to_attendees
-from app.api.helpers.order import calculate_order_amount, create_pdf_tickets_for_holder, on_order_completed
+from app.api.helpers.order import (
+    calculate_order_amount,
+    create_pdf_tickets_for_holder,
+    on_order_completed,
+)
 from app.api.helpers.permission_manager import has_access
 from app.api.orders import validate_attendees
 from app.api.schema.orders import OrderSchema
@@ -40,14 +44,11 @@ def ticket_attendee_authorized(order_identifier):
             raise NotFoundError(
                 {'source': ''}, 'This ticket is not associated with any order'
             )
-        if (
-            has_access(
-                'is_coorganizer_or_user_itself',
-                event_id=order.event_id,
-                user_id=order.user_id,
-            )
-            or order.is_attendee(current_user)
-        ):
+        if has_access(
+            'is_coorganizer_or_user_itself',
+            event_id=order.event_id,
+            user_id=order.user_id,
+        ) or order.is_attendee(current_user):
             file_path = order.ticket_pdf_path
             if not os.path.isfile(file_path):
                 create_pdf_tickets_for_holder(order)
@@ -155,7 +156,7 @@ def create_order():
         ticket_info = ticket_map[order_ticket.ticket.id]
         order_ticket.price = ticket_info.get('price')
         save_to_db(order_ticket)
-    
+
     return OrderSchema().dump(order)
 
 
@@ -184,30 +185,47 @@ def ticket_attendee_pdf(attendee_id):
         create_pdf_tickets_for_holder(ticket_holder.order)
     return send_from_directory('../', file_path, as_attachment=True)
 
+
 @order_blueprint.route('/<string:order_identifier>/verify', methods=['POST'])
 def verify_order_payment(order_identifier):
 
     order = Order.query.filter_by(identifier=order_identifier).first()
-    
+
     if order.payment_mode == 'stripe':
         try:
-            payment_intent = StripePaymentsManager.retrieve_payment_intent(order.event, order.stripe_payment_intent_id)
+            payment_intent = StripePaymentsManager.retrieve_payment_intent(
+                order.event, order.stripe_payment_intent_id
+            )
         except Exception as e:
             raise e
 
         if payment_intent['status'] == 'succeeded':
             order.status = 'completed'
             order.completed_at = datetime.utcnow()
-            order.paid_via = payment_intent['charges']['data'][0]['payment_method_details']['type']
-            order.transaction_id = payment_intent['charges']['data'][0]['balance_transaction']
-            if payment_intent['charges']['data'][0]['payment_method_details']['type'] == 'card' :
-                order.brand = payment_intent['charges']['data'][0]['payment_method_details']['card']['brand']
-                order.exp_month = payment_intent['charges']['data'][0]['payment_method_details']['card']['exp_month']
-                order.exp_year = payment_intent['charges']['data'][0]['payment_method_details']['card']['exp_year']
-                order.last4 = payment_intent['charges']['data'][0]['payment_method_details']['card']['last4']
+            order.paid_via = payment_intent['charges']['data'][0][
+                'payment_method_details'
+            ]['type']
+            order.transaction_id = payment_intent['charges']['data'][0][
+                'balance_transaction'
+            ]
+            if (
+                payment_intent['charges']['data'][0]['payment_method_details']['type']
+                == 'card'
+            ):
+                order.brand = payment_intent['charges']['data'][0][
+                    'payment_method_details'
+                ]['card']['brand']
+                order.exp_month = payment_intent['charges']['data'][0][
+                    'payment_method_details'
+                ]['card']['exp_month']
+                order.exp_year = payment_intent['charges']['data'][0][
+                    'payment_method_details'
+                ]['card']['exp_year']
+                order.last4 = payment_intent['charges']['data'][0][
+                    'payment_method_details'
+                ]['card']['last4']
             save_to_db(order)
 
             on_order_completed(order)
 
-
-    return jsonify({ 'payment_status': order.status})
+    return jsonify({'payment_status': order.status})

app/api/event_invoices.py

@@ -76,9 +76,7 @@ def before_get_object(self, view_kwargs):
         if not current_user.is_staff and event_invoice.user_id != current_user.id:
             raise ForbiddenError({'source': ''}, 'Admin access is required')
 
-    methods = [
-        'GET','PATCH'
-    ]
+    methods = ['GET', 'PATCH']
     decorators = (jwt_required,)
     schema = EventInvoiceSchema
     data_layer = {

app/api/helpers/custom_forms.py

@@ -16,7 +16,14 @@ def get_schema(form_fields):
     attrs = {}
 
     for field in form_fields:
-        if field.type in ['text', 'checkbox', 'select', 'paragraph', 'year', 'richtextlink']:
+        if field.type in [
+            'text',
+            'checkbox',
+            'select',
+            'paragraph',
+            'year',
+            'richtextlink',
+        ]:
             field_type = marshmallow.fields.Str
         elif field.type == 'email':
             field_type = TrimmedEmail

app/api/helpers/mail.py

@@ -21,11 +21,7 @@
 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.dates import format_date, format_time, format_datetime
 from babel.numbers import format_currency
 
 logger = logging.getLogger(__name__)
@@ -412,9 +408,7 @@ def send_email_announce_event(event, group, emails):
                     event_location=event_location,
                     event_date=convert_to_user_locale(email, date=event_date),
                     event_time=convert_to_user_locale(
-                        email,
-                        time=event_time,
-                        tz=event.timezone
+                        email, time=event_time, tz=event.timezone
                     ),
                     group_name=group_name,
                     group_url=group_url,
@@ -654,16 +648,12 @@ def send_order_purchase_organizer_email(order, recipients):
         ),
         timezone=order.event.timezone,
         purchase_time=convert_to_user_locale(
-            emails[0],
-            date_time=order.completed_at,
-            tz=order.event.timezone
+            emails[0], date_time=order.completed_at, tz=order.event.timezone
         ),
         payment_mode=order.payment_mode,
         payment_status=order.status,
         order_amount=convert_to_user_locale(
-            emails[0],
-            amount=order.amount,
-            currency=order.event.payment_currency
+            emails[0], amount=order.amount, currency=order.event.payment_currency
         ),
         tickets_count=order.tickets_count,
         order_tickets=order_tickets,
@@ -828,7 +818,9 @@ def send_email_after_event_speaker(email, event_name):
     )
 
 
-def convert_to_user_locale(email, date_time=None, date=None, time=None, tz=None, amount=None, currency=None):
+def convert_to_user_locale(
+    email, date_time=None, date=None, time=None, tz=None, amount=None, currency=None
+):
     """
     Convert date and time and amount to user selected language
     :return        : datetime/date/time translated to user locale
@@ -845,21 +837,15 @@ def convert_to_user_locale(email, date_time=None, date=None, time=None, tz=None,
 
         if date_time and tz:
             return format_datetime(
-                date_time,
-                'full',
-                tzinfo=pytz.timezone(tz),
-                locale=user_locale
+                date_time, 'full', tzinfo=pytz.timezone(tz), locale=user_locale
             )
-        
+
         if date:
             return format_date(date, 'd MMMM Y', locale=user_locale)
-        
+
         if time and tz:
             return format_time(
-                time,
-                'HH:mm (zzzz)',
-                tzinfo=pytz.timezone(tz),
-                locale=user_locale
+                time, 'HH:mm (zzzz)', tzinfo=pytz.timezone(tz), locale=user_locale
             )
 
     return None

app/api/helpers/order.py

@@ -283,7 +283,9 @@ def calculate_order_amount(tickets, discount_code=None):
                     f"{ticket.min_price} to {ticket.max_price}",
                 )
         else:
-            price = ticket.price if ticket.type not in ['free', 'freeRegistration'] else 0.0
+            price = (
+                ticket.price if ticket.type not in ['free', 'freeRegistration'] else 0.0
+            )
 
         if tax:
             if tax_included:

app/api/helpers/static.py

@@ -549,8 +549,18 @@
     'USD',
 ]
 
-AGE_GROUP_CHOICES = ['Under 18', '18-24', '25-34', '35-44', '45-54', '55-64', '65-74', '75-84', '85+', 'I prefer not '
-                                                                                                       'to say']
+AGE_GROUP_CHOICES = [
+    'Under 18',
+    '18-24',
+    '25-34',
+    '35-44',
+    '45-54',
+    '55-64',
+    '65-74',
+    '75-84',
+    '85+',
+    'I prefer not to say',
+]
 
 GENDER_CHOICES = [
     'Male',