diff options
Diffstat (limited to 'postgresqleu')
85 files changed, 49 insertions, 159 deletions
diff --git a/postgresqleu/account/views.py b/postgresqleu/account/views.py index 71d9c0da..578e3fad 100644 --- a/postgresqleu/account/views.py +++ b/postgresqleu/account/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import render from django.contrib.auth.decorators import login_required diff --git a/postgresqleu/accountinfo/views.py b/postgresqleu/accountinfo/views.py index 1c250338..494a64ea 100644 --- a/postgresqleu/accountinfo/views.py +++ b/postgresqleu/accountinfo/views.py @@ -1,7 +1,6 @@ from django.http import HttpResponse from django.db.models import Q from django.db import transaction -from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User diff --git a/postgresqleu/accounting/views.py b/postgresqleu/accounting/views.py index 05b2d21c..ff0a3bbe 100644 --- a/postgresqleu/accounting/views.py +++ b/postgresqleu/accounting/views.py @@ -1,5 +1,4 @@ from django.http import HttpResponseRedirect, Http404, HttpResponse -from django.contrib.auth.decorators import login_required from django.contrib import messages from django.shortcuts import render, get_object_or_404 from django.forms.models import inlineformset_factory diff --git a/postgresqleu/adyen/management/commands/process_adyen_reports.py b/postgresqleu/adyen/management/commands/process_adyen_reports.py index 89ad1482..df74b7a2 100644 --- a/postgresqleu/adyen/management/commands/process_adyen_reports.py +++ b/postgresqleu/adyen/management/commands/process_adyen_reports.py @@ -14,7 +14,6 @@ import csv import io import requests from requests.auth import HTTPBasicAuth -from base64 import standard_b64encode from datetime import timedelta from decimal import Decimal diff --git a/postgresqleu/adyen/util.py b/postgresqleu/adyen/util.py index 8737b1a5..431d1bf8 100644 --- a/postgresqleu/adyen/util.py +++ b/postgresqleu/adyen/util.py @@ -7,7 +7,6 @@ from decimal import Decimal import requests from requests.auth import HTTPBasicAuth -from base64 import standard_b64encode from postgresqleu.mailqueue.util import send_simple_mail from postgresqleu.invoices.util import InvoiceManager diff --git a/postgresqleu/auth.py b/postgresqleu/auth.py index 87ffb0b2..55eb9b64 100644 --- a/postgresqleu/auth.py +++ b/postgresqleu/auth.py @@ -28,7 +28,7 @@ from django.conf import settings import base64 import json import socket -from urllib.parse import urlparse, urlencode, parse_qs +from urllib.parse import urlencode, parse_qs import requests from Cryptodome.Cipher import AES from Cryptodome.Hash import SHA diff --git a/postgresqleu/braintreepayment/views.py b/postgresqleu/braintreepayment/views.py index d8c9aca2..985cbb1e 100644 --- a/postgresqleu/braintreepayment/views.py +++ b/postgresqleu/braintreepayment/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, get_object_or_404 from django.contrib.auth.decorators import login_required -from django.http import HttpResponseForbidden, HttpResponseRedirect +from django.http import HttpResponseRedirect from django.conf import settings from django.utils import timezone from django.db import transaction diff --git a/postgresqleu/confreg/admin.py b/postgresqleu/confreg/admin.py index 8441c9d1..bdbb947b 100644 --- a/postgresqleu/confreg/admin.py +++ b/postgresqleu/confreg/admin.py @@ -1,9 +1,7 @@ from django.contrib import admin from django import forms -from django.http import HttpResponseRedirect from django.forms import ValidationError from django.forms.utils import ErrorList -from django.db.models.fields.files import ImageFieldFile from django.db.models import Count from django.urls import reverse from django.utils.safestring import mark_safe @@ -23,13 +21,9 @@ from .models import ConferenceNews from postgresqleu.util.forms import ConcurrentProtectedModelForm -from .util import notify_reg_confirmed - from postgresqleu.accounting.models import Object from postgresqleu.confsponsor.models import Sponsor -from datetime import datetime - # # List filters diff --git a/postgresqleu/confreg/backendforms.py b/postgresqleu/confreg/backendforms.py index d383dbc5..6e2b7ed7 100644 --- a/postgresqleu/confreg/backendforms.py +++ b/postgresqleu/confreg/backendforms.py @@ -7,17 +7,15 @@ import django.forms import django.forms.widgets from django.utils.safestring import mark_safe from django.utils.html import escape -from django.utils import timezone from django.conf import settings import datetime from collections import OrderedDict from psycopg2.extras import DateTimeTZRange -from decimal import Decimal import pytz from postgresqleu.util.db import exec_to_single_list, exec_to_scalar -from postgresqleu.util.forms import ConcurrentProtectedModelForm, SelectSetValueField +from postgresqleu.util.forms import SelectSetValueField from postgresqleu.util.widgets import StaticTextWidget, EmailTextWidget, MonospaceTextarea from postgresqleu.util.widgets import TagOptionsTextWidget from postgresqleu.util.random import generate_random_token diff --git a/postgresqleu/confreg/backendlookups.py b/postgresqleu/confreg/backendlookups.py index dbb91a63..b89fb5ee 100644 --- a/postgresqleu/confreg/backendlookups.py +++ b/postgresqleu/confreg/backendlookups.py @@ -1,7 +1,7 @@ from django.db.models import Q from postgresqleu.util.backendlookups import LookupBase -from postgresqleu.confreg.models import Conference, ConferenceRegistration, Speaker +from postgresqleu.confreg.models import ConferenceRegistration, Speaker from postgresqleu.confreg.models import ConferenceSessionTag diff --git a/postgresqleu/confreg/backendviews.py b/postgresqleu/confreg/backendviews.py index ac5a29ab..44e1c7cd 100644 --- a/postgresqleu/confreg/backendviews.py +++ b/postgresqleu/confreg/backendviews.py @@ -15,7 +15,6 @@ from collections import OrderedDict from postgresqleu.util.db import exec_to_list, exec_to_dict, exec_no_result, exec_to_scalar from postgresqleu.util.decorators import superuser_required -from postgresqleu.util.messaging.twitter import Twitter, TwitterSetup from postgresqleu.util.messaging import messaging_implementations, get_messaging_class from postgresqleu.util.messaging.util import send_reg_direct_message from postgresqleu.util.backendviews import backend_list_editor, backend_process_form @@ -27,7 +26,7 @@ from .jinjapdf import render_jinja_ticket, render_jinja_badges from .util import send_conference_mail, get_conference_or_404, send_conference_notification from .models import Conference, ConferenceSeries -from .models import ConferenceRegistration, Speaker +from .models import ConferenceRegistration from .models import PrepaidBatch from .models import BulkPayment from .models import AccessToken diff --git a/postgresqleu/confreg/campaigns.py b/postgresqleu/confreg/campaigns.py index 2a23891e..4eba396a 100644 --- a/postgresqleu/confreg/campaigns.py +++ b/postgresqleu/confreg/campaigns.py @@ -3,7 +3,7 @@ from django.core.exceptions import ValidationError from django.http import Http404, HttpResponse from django.utils.dateparse import parse_datetime, parse_duration from django.utils import timezone -from postgresqleu.confreg.jinjafunc import JinjaTemplateValidator, render_sandboxed_template +from postgresqleu.confreg.jinjafunc import render_sandboxed_template from postgresqleu.util.widgets import MonospaceTextarea from postgresqleu.confreg.models import ConferenceSession, Track diff --git a/postgresqleu/confreg/checkin.py b/postgresqleu/confreg/checkin.py index 21b944b6..cb03c760 100644 --- a/postgresqleu/confreg/checkin.py +++ b/postgresqleu/confreg/checkin.py @@ -9,13 +9,13 @@ from django.contrib import messages from django.utils import timezone from django.conf import settings -from postgresqleu.util.db import exec_to_list, exec_to_dict +from postgresqleu.util.db import exec_to_list from postgresqleu.util.db import ensure_conference_timezone from postgresqleu.util.qr import generate_base64_qr from postgresqleu.util.decorators import global_login_exempt from postgresqleu.util.request import get_int_or_error -from .models import Conference, ConferenceRegistration +from .models import ConferenceRegistration from .views import render_conference_response from .util import send_conference_mail, get_conference_or_404 diff --git a/postgresqleu/confreg/feedback.py b/postgresqleu/confreg/feedback.py index 12a834c1..d17d2ab3 100644 --- a/postgresqleu/confreg/feedback.py +++ b/postgresqleu/confreg/feedback.py @@ -2,7 +2,7 @@ from django.shortcuts import render from django.db.models import Count from django.db import connection -from .models import ConferenceFeedbackQuestion, ConferenceFeedbackAnswer +from .models import ConferenceFeedbackAnswer from postgresqleu.confreg.util import get_authenticated_conference from postgresqleu.util.request import get_int_or_error diff --git a/postgresqleu/confreg/feeds.py b/postgresqleu/confreg/feeds.py index 1d534c39..132ccee4 100644 --- a/postgresqleu/confreg/feeds.py +++ b/postgresqleu/confreg/feeds.py @@ -1,6 +1,5 @@ from django.contrib.syndication.views import Feed from django.conf import settings -from django.shortcuts import get_object_or_404 from django.utils import timezone from django.template.defaultfilters import slugify diff --git a/postgresqleu/confreg/forms.py b/postgresqleu/confreg/forms.py index efc93d5f..cd2030fd 100644 --- a/postgresqleu/confreg/forms.py +++ b/postgresqleu/confreg/forms.py @@ -7,8 +7,6 @@ from django.utils.safestring import mark_safe from django.utils.html import escape from django.utils import timezone -from django.db.models.fields.files import ImageFieldFile - from postgresqleu.confsponsor.models import ScannedAttendee from .models import Conference from .models import ConferenceRegistration, RegistrationType, Speaker diff --git a/postgresqleu/confreg/jinjafunc.py b/postgresqleu/confreg/jinjafunc.py index 8e84c435..4e6259b5 100644 --- a/postgresqleu/confreg/jinjafunc.py +++ b/postgresqleu/confreg/jinjafunc.py @@ -8,7 +8,6 @@ from django.utils.timesince import timesince from django.utils import timezone from django.conf import settings -import json import os.path import random from itertools import groupby diff --git a/postgresqleu/confreg/management/commands/confreg_frequent_reminders.py b/postgresqleu/confreg/management/commands/confreg_frequent_reminders.py index 1f835566..2183282f 100644 --- a/postgresqleu/confreg/management/commands/confreg_frequent_reminders.py +++ b/postgresqleu/confreg/management/commands/confreg_frequent_reminders.py @@ -6,8 +6,7 @@ # from django.core.management.base import BaseCommand -from django.db import transaction, connection -from django.conf import settings +from django.db import transaction from django.utils import timezone from datetime import timedelta diff --git a/postgresqleu/confreg/migrations/0014_check_constraint_token.py b/postgresqleu/confreg/migrations/0014_check_constraint_token.py index 8757ecbc..fcf98f79 100644 --- a/postgresqleu/confreg/migrations/0014_check_constraint_token.py +++ b/postgresqleu/confreg/migrations/0014_check_constraint_token.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/postgresqleu/confreg/migrations/0015_remove_non_jinja_conferences.py b/postgresqleu/confreg/migrations/0015_remove_non_jinja_conferences.py index 95f39ff0..73fcf56c 100644 --- a/postgresqleu/confreg/migrations/0015_remove_non_jinja_conferences.py +++ b/postgresqleu/confreg/migrations/0015_remove_non_jinja_conferences.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/postgresqleu/confreg/migrations/0018_constraint_reg_payments.py b/postgresqleu/confreg/migrations/0018_constraint_reg_payments.py index 6b66dc15..236cb4da 100644 --- a/postgresqleu/confreg/migrations/0018_constraint_reg_payments.py +++ b/postgresqleu/confreg/migrations/0018_constraint_reg_payments.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/postgresqleu/confreg/migrations/0020_unique_regdays.py b/postgresqleu/confreg/migrations/0020_unique_regdays.py index 1bbd9726..5c313d6e 100644 --- a/postgresqleu/confreg/migrations/0020_unique_regdays.py +++ b/postgresqleu/confreg/migrations/0020_unique_regdays.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/postgresqleu/confreg/models.py b/postgresqleu/confreg/models.py index f1c2d115..33871c45 100644 --- a/postgresqleu/confreg/models.py +++ b/postgresqleu/confreg/models.py @@ -14,7 +14,6 @@ from django.template.defaultfilters import slugify from django.contrib.postgres.fields import DateTimeRangeField, JSONField from django.contrib.postgres.indexes import GinIndex from django.core.serializers.json import DjangoJSONEncoder -from django.utils import timezone from postgresqleu.util.validators import validate_lowercase, validate_urlname from postgresqleu.util.validators import TwitterValidator @@ -25,7 +24,6 @@ from postgresqleu.util.time import today_conference from postgresqleu.util.db import exec_no_result import base64 -import datetime import pytz from decimal import Decimal diff --git a/postgresqleu/confreg/reports.py b/postgresqleu/confreg/reports.py index 753f8b8d..19241556 100644 --- a/postgresqleu/confreg/reports.py +++ b/postgresqleu/confreg/reports.py @@ -1,7 +1,5 @@ -from django.db.models import Q from django.http import HttpResponse from django.shortcuts import render -from django import forms from reportlab.lib import colors from reportlab.platypus import Table, TableStyle, SimpleDocTemplate, Paragraph diff --git a/postgresqleu/confreg/twitter.py b/postgresqleu/confreg/twitter.py index c9cf8784..5e58f3ee 100644 --- a/postgresqleu/confreg/twitter.py +++ b/postgresqleu/confreg/twitter.py @@ -1,8 +1,7 @@ -from django.contrib.auth.decorators import login_required from django.core.serializers.json import DjangoJSONEncoder from django.core.exceptions import PermissionDenied from django.shortcuts import render, get_object_or_404 -from django.http import HttpResponse, HttpResponseRedirect, Http404 +from django.http import HttpResponse, Http404 from django.views.decorators.csrf import csrf_exempt from django.contrib.postgres.aggregates import ArrayAgg from django.db import transaction diff --git a/postgresqleu/confreg/util.py b/postgresqleu/confreg/util.py index dc61ca7c..92c7dfbf 100644 --- a/postgresqleu/confreg/util.py +++ b/postgresqleu/confreg/util.py @@ -6,7 +6,7 @@ from django.utils import timezone import os from decimal import Decimal -from datetime import datetime, date, timedelta +from datetime import timedelta import urllib.parse from io import BytesIO import re diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py index 193fb502..9dc77927 100644 --- a/postgresqleu/confreg/views.py +++ b/postgresqleu/confreg/views.py @@ -12,7 +12,6 @@ from django.conf import settings from django.db import transaction, connection from django.db.models import Q, Count, Avg from django.db.models.expressions import F -from django import forms from django.forms import ValidationError from django.utils import timezone from django.template.defaultfilters import slugify @@ -58,12 +57,10 @@ from .backendforms import CancelRegistrationForm, ConfirmRegistrationForm from .backendforms import ResendWelcomeMailForm from postgresqleu.util.request import get_int_or_error -from postgresqleu.util.decorators import superuser_required from postgresqleu.util.random import generate_random_token from postgresqleu.util.time import today_conference from postgresqleu.util.messaging import get_messaging from postgresqleu.util.pagination import simple_pagination -from postgresqleu.invoices.models import Invoice, InvoicePaymentMethod, InvoiceRow from postgresqleu.invoices.util import InvoiceWrapper from postgresqleu.confwiki.models import Wikipage from postgresqleu.confsponsor.models import ScannedAttendee, PurchasedVoucher @@ -79,11 +76,10 @@ from postgresqleu.util.qr import generate_base64_qr from decimal import Decimal from operator import itemgetter -from datetime import datetime, timedelta, date +from datetime import timedelta import base64 import re import os -from email.mime.text import MIMEText from Cryptodome.Hash import SHA256 from io import StringIO import xml.etree.ElementTree as ET diff --git a/postgresqleu/confreg/volsched.py b/postgresqleu/confreg/volsched.py index 6c0f41ff..59cbe419 100644 --- a/postgresqleu/confreg/volsched.py +++ b/postgresqleu/confreg/volsched.py @@ -1,11 +1,9 @@ from django.contrib.auth.decorators import login_required from django.shortcuts import render, get_object_or_404 -from django.contrib import messages -from django.http import HttpResponse, HttpResponseRedirect, Http404 +from django.http import HttpResponse, Http404 from django.core.exceptions import PermissionDenied from django.db import transaction from django.db.models import Count, Sum, F, Func -from django.conf.urls import url from datetime import datetime import json @@ -13,7 +11,7 @@ import json from postgresqleu.util.db import exec_to_dict from postgresqleu.util.request import get_int_or_error -from .models import Conference, ConferenceRegistration +from .models import ConferenceRegistration from .models import VolunteerSlot, VolunteerAssignment from .util import send_conference_notification_template, get_conference_or_404 diff --git a/postgresqleu/confsponsor/admin.py b/postgresqleu/confsponsor/admin.py index e9d30d06..135f7e7d 100644 --- a/postgresqleu/confsponsor/admin.py +++ b/postgresqleu/confsponsor/admin.py @@ -1,7 +1,6 @@ from django.contrib import admin from django.http import HttpResponseRedirect from django.forms.models import BaseInlineFormSet -from django.forms.utils import ErrorList from django.urls import reverse from django.utils.safestring import mark_safe diff --git a/postgresqleu/confsponsor/benefitclasses/badgescanning.py b/postgresqleu/confsponsor/benefitclasses/badgescanning.py index c9d64f67..d8d34eea 100644 --- a/postgresqleu/confsponsor/benefitclasses/badgescanning.py +++ b/postgresqleu/confsponsor/benefitclasses/badgescanning.py @@ -2,15 +2,8 @@ from django import forms from django.core.exceptions import ValidationError from postgresqleu.confsponsor.backendforms import BackendSponsorshipLevelBenefitForm -from datetime import datetime -import base64 -import io as StringIO -import csv - from .base import BaseBenefit, BaseBenefitForm -from postgresqleu.confreg.models import ConferenceRegistration - class BadgeScanningForm(BaseBenefitForm): confirm = forms.ChoiceField(label="Claim benefit", choices=((0, '* Choose'), (1, 'Claim this benefit'), (2, 'Decline this benefit'))) diff --git a/postgresqleu/confsponsor/benefitclasses/base.py b/postgresqleu/confsponsor/benefitclasses/base.py index e0f5b7cf..14c262b0 100644 --- a/postgresqleu/confsponsor/benefitclasses/base.py +++ b/postgresqleu/confsponsor/benefitclasses/base.py @@ -1,7 +1,5 @@ from django import forms -from postgresqleu.util.validators import validate_json_structure - class BaseBenefit(object): def __init__(self, level, params): diff --git a/postgresqleu/confsponsor/benefitclasses/providetext.py b/postgresqleu/confsponsor/benefitclasses/providetext.py index 04f62bc8..62fb8698 100644 --- a/postgresqleu/confsponsor/benefitclasses/providetext.py +++ b/postgresqleu/confsponsor/benefitclasses/providetext.py @@ -1,6 +1,6 @@ from django.core.exceptions import ValidationError from django import forms -from django.core.validators import MaxValueValidator, MinValueValidator +from django.core.validators import MinValueValidator from postgresqleu.confsponsor.backendforms import BackendSponsorshipLevelBenefitForm diff --git a/postgresqleu/confsponsor/forms.py b/postgresqleu/confsponsor/forms.py index b3979c99..a5994dcf 100644 --- a/postgresqleu/confsponsor/forms.py +++ b/postgresqleu/confsponsor/forms.py @@ -8,7 +8,7 @@ from django.conf import settings from .models import Sponsor, SponsorMail, SponsorshipLevel from .models import vat_status_choices from .models import Shipment -from postgresqleu.confreg.models import Conference, RegistrationType, DiscountCode +from postgresqleu.confreg.models import RegistrationType, DiscountCode from postgresqleu.countries.models import EuropeCountry from postgresqleu.confreg.models import ConferenceAdditionalOption diff --git a/postgresqleu/confsponsor/invoicehandler.py b/postgresqleu/confsponsor/invoicehandler.py index 545d979a..84be2450 100644 --- a/postgresqleu/confsponsor/invoicehandler.py +++ b/postgresqleu/confsponsor/invoicehandler.py @@ -5,7 +5,6 @@ from datetime import timedelta import base64 import os -from postgresqleu.mailqueue.util import send_simple_mail from postgresqleu.invoices.util import InvoiceManager from postgresqleu.util.time import today_conference diff --git a/postgresqleu/confsponsor/management/commands/sponsor_generate_discount_invoices.py b/postgresqleu/confsponsor/management/commands/sponsor_generate_discount_invoices.py index 675ba3c6..c5abbff7 100644 --- a/postgresqleu/confsponsor/management/commands/sponsor_generate_discount_invoices.py +++ b/postgresqleu/confsponsor/management/commands/sponsor_generate_discount_invoices.py @@ -13,9 +13,7 @@ from django.db.models import Q, F, Count from postgresqleu.confreg.models import DiscountCode from postgresqleu.confreg.util import send_conference_mail -from postgresqleu.confsponsor.models import Sponsor from postgresqleu.confsponsor.util import send_conference_sponsor_notification -from postgresqleu.mailqueue.util import send_simple_mail from postgresqleu.invoices.util import InvoiceManager, InvoiceWrapper from postgresqleu.util.time import today_global diff --git a/postgresqleu/confsponsor/migrations/0004_anothervat.py b/postgresqleu/confsponsor/migrations/0004_anothervat.py index a33061e9..336a9518 100644 --- a/postgresqleu/confsponsor/migrations/0004_anothervat.py +++ b/postgresqleu/confsponsor/migrations/0004_anothervat.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): diff --git a/postgresqleu/confsponsor/migrations/0006_track_sponsor_signup_time.py b/postgresqleu/confsponsor/migrations/0006_track_sponsor_signup_time.py index 3c89627c..93bb9416 100644 --- a/postgresqleu/confsponsor/migrations/0006_track_sponsor_signup_time.py +++ b/postgresqleu/confsponsor/migrations/0006_track_sponsor_signup_time.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import migrations, models -import datetime class Migration(migrations.Migration): diff --git a/postgresqleu/confsponsor/models.py b/postgresqleu/confsponsor/models.py index ea555ce6..c007234b 100644 --- a/postgresqleu/confsponsor/models.py +++ b/postgresqleu/confsponsor/models.py @@ -1,6 +1,4 @@ from django.db import models -from django.db.models.signals import pre_delete -from django.core.exceptions import ValidationError from django.utils.functional import cached_property from django.contrib.auth.models import User from django.contrib.postgres.fields import JSONField @@ -15,8 +13,6 @@ from postgresqleu.util.random import generate_random_token from .benefits import benefit_choices -from django.db.models import FileField - vat_status_choices = ( (0, 'Company is from inside EU and has VAT number'), (1, 'Company is from inside EU, but does not have VAT number'), diff --git a/postgresqleu/confsponsor/scanning.py b/postgresqleu/confsponsor/scanning.py index 2acea6ef..109d7aa2 100644 --- a/postgresqleu/confsponsor/scanning.py +++ b/postgresqleu/confsponsor/scanning.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import render from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.views.decorators.csrf import csrf_exempt from django.contrib import messages diff --git a/postgresqleu/confsponsor/views.py b/postgresqleu/confsponsor/views.py index a21fa9a3..724d558d 100644 --- a/postgresqleu/confsponsor/views.py +++ b/postgresqleu/confsponsor/views.py @@ -22,7 +22,6 @@ from postgresqleu.confreg.util import get_authenticated_conference, get_conferen from postgresqleu.confreg.jinjafunc import render_sandboxed_template from postgresqleu.confreg.util import send_conference_mail, send_conference_notification from postgresqleu.confreg.twitter import post_conference_social -from postgresqleu.mailqueue.util import send_simple_mail from postgresqleu.util.storage import InlineEncodedStorage from postgresqleu.util.decorators import superuser_required from postgresqleu.util.request import get_int_or_error diff --git a/postgresqleu/confwiki/views.py b/postgresqleu/confwiki/views.py index a6003d56..6500a444 100644 --- a/postgresqleu/confwiki/views.py +++ b/postgresqleu/confwiki/views.py @@ -3,7 +3,6 @@ from django.http import HttpResponseRedirect from django.core.exceptions import PermissionDenied from django.contrib.auth.decorators import login_required from django.db import transaction, connection -from django.db.models import Q from django.contrib import messages from django.conf import settings from django.template.defaultfilters import slugify @@ -14,10 +13,10 @@ import difflib from postgresqleu.mailqueue.util import send_simple_mail -from postgresqleu.confreg.models import Conference, ConferenceRegistration +from postgresqleu.confreg.models import ConferenceRegistration from postgresqleu.confreg.views import render_conference_response from postgresqleu.confreg.util import get_authenticated_conference, get_conference_or_404 -from postgresqleu.confreg.util import send_conference_mail, reglog +from postgresqleu.confreg.util import reglog from postgresqleu.util.db import exec_to_scalar, exec_to_list from postgresqleu.util.request import get_int_or_error diff --git a/postgresqleu/invoices/backendforms.py b/postgresqleu/invoices/backendforms.py index 7458077a..7f5e556d 100644 --- a/postgresqleu/invoices/backendforms.py +++ b/postgresqleu/invoices/backendforms.py @@ -3,7 +3,6 @@ import django.forms from postgresqleu.util.backendforms import BackendForm from postgresqleu.util.widgets import TestButtonWidget from postgresqleu.invoices.models import VatRate, VatValidationCache, InvoicePaymentMethod -from postgresqleu.accounting.models import Account from postgresqleu.util.payment import payment_implementation_choices diff --git a/postgresqleu/invoices/forms.py b/postgresqleu/invoices/forms.py index 8502eba0..3408a795 100644 --- a/postgresqleu/invoices/forms.py +++ b/postgresqleu/invoices/forms.py @@ -5,8 +5,6 @@ from django.forms import widgets from django.contrib.auth.models import User from django.conf import settings -from decimal import Decimal - from postgresqleu.util.widgets import HtmlDateInput from .models import Invoice, InvoiceRow, InvoicePaymentMethod diff --git a/postgresqleu/invoices/management/commands/send_invoice_reminders.py b/postgresqleu/invoices/management/commands/send_invoice_reminders.py index cd0c1077..3aa53213 100755 --- a/postgresqleu/invoices/management/commands/send_invoice_reminders.py +++ b/postgresqleu/invoices/management/commands/send_invoice_reminders.py @@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand from django.db import transaction from django.utils import timezone -from datetime import datetime, timedelta, time +from datetime import timedelta, time from postgresqleu.invoices.models import Invoice from postgresqleu.invoices.util import InvoiceWrapper diff --git a/postgresqleu/invoices/migrations/0002_invoice_paidusing.py b/postgresqleu/invoices/migrations/0002_invoice_paidusing.py index 0ed8c3fe..33a77da4 100644 --- a/postgresqleu/invoices/migrations/0002_invoice_paidusing.py +++ b/postgresqleu/invoices/migrations/0002_invoice_paidusing.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import migrations, models -from django.conf import settings class Migration(migrations.Migration): diff --git a/postgresqleu/invoices/migrations/0003_initial_invoice_processors.py b/postgresqleu/invoices/migrations/0003_initial_invoice_processors.py index bed8c545..92353e3e 100644 --- a/postgresqleu/invoices/migrations/0003_initial_invoice_processors.py +++ b/postgresqleu/invoices/migrations/0003_initial_invoice_processors.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations def create_invoice_processors(apps, schema_editor): diff --git a/postgresqleu/invoices/util.py b/postgresqleu/invoices/util.py index fa2e266e..85f0bf85 100644 --- a/postgresqleu/invoices/util.py +++ b/postgresqleu/invoices/util.py @@ -8,7 +8,6 @@ from collections import defaultdict from dateutil import rrule from decimal import Decimal import importlib -import os import base64 import re import io diff --git a/postgresqleu/mailqueue/backendforms.py b/postgresqleu/mailqueue/backendforms.py index db0c932b..50be0b3d 100644 --- a/postgresqleu/mailqueue/backendforms.py +++ b/postgresqleu/mailqueue/backendforms.py @@ -1,5 +1,4 @@ from django import forms -from django.utils.text import Truncator from email.parser import Parser diff --git a/postgresqleu/membership/admin.py b/postgresqleu/membership/admin.py index 86a4a603..b9c68e11 100644 --- a/postgresqleu/membership/admin.py +++ b/postgresqleu/membership/admin.py @@ -1,10 +1,7 @@ from django.contrib import admin from django.db.models import Q -from django.http import HttpResponseRedirect from django.utils import timezone -import urllib.parse - from .models import Member, MemberLog, Meeting diff --git a/postgresqleu/membership/backendforms.py b/postgresqleu/membership/backendforms.py index d7b6eef0..d003dc3c 100644 --- a/postgresqleu/membership/backendforms.py +++ b/postgresqleu/membership/backendforms.py @@ -6,7 +6,6 @@ from collections import OrderedDict from postgresqleu.util.widgets import StaticTextWidget, EmailTextWidget from postgresqleu.util.backendforms import BackendForm -from postgresqleu.util.backendlookups import GeneralAccountLookup from postgresqleu.membership.models import Member, MemberLog, Meeting, MembershipConfiguration from postgresqleu.membership.backendlookups import MemberLookup diff --git a/postgresqleu/membership/backendviews.py b/postgresqleu/membership/backendviews.py index 5f01efe5..4f428585 100644 --- a/postgresqleu/membership/backendviews.py +++ b/postgresqleu/membership/backendviews.py @@ -8,7 +8,7 @@ from django.conf import settings from postgresqleu.util.backendviews import backend_list_editor, backend_process_form from postgresqleu.util.auth import authenticate_backend_group -from postgresqleu.mailqueue.util import send_mail, send_simple_mail +from postgresqleu.mailqueue.util import send_simple_mail from postgresqleu.membership.models import MembershipConfiguration, get_config, Member from postgresqleu.membership.backendforms import BackendMemberForm, BackendMeetingForm from postgresqleu.membership.backendforms import BackendConfigForm diff --git a/postgresqleu/membership/forms.py b/postgresqleu/membership/forms.py index 4e63ca41..8cd0f4d4 100644 --- a/postgresqleu/membership/forms.py +++ b/postgresqleu/membership/forms.py @@ -1,6 +1,4 @@ from django import forms -from django.core.exceptions import ValidationError -from django.conf import settings from .models import Member, get_config from .util import validate_country diff --git a/postgresqleu/membership/models.py b/postgresqleu/membership/models.py index cd352f52..b22b2549 100644 --- a/postgresqleu/membership/models.py +++ b/postgresqleu/membership/models.py @@ -1,7 +1,6 @@ from django.db import models from django.core.validators import MinValueValidator, MaxValueValidator from django.contrib.auth.models import User -from django.conf import settings from django.utils import timezone from postgresqleu.util.fields import LowercaseEmailField diff --git a/postgresqleu/membership/views.py b/postgresqleu/membership/views.py index a19291b4..cbe21cf8 100644 --- a/postgresqleu/membership/views.py +++ b/postgresqleu/membership/views.py @@ -1,7 +1,6 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.contrib.auth.decorators import login_required -from django.contrib import messages from django.conf import settings from django.db import transaction from django.db.models import Q @@ -10,12 +9,10 @@ from django.utils import timezone from .models import Member, MemberLog, Meeting, MemberMeetingKey, get_config from .forms import MemberForm, ProxyVoterForm -from postgresqleu.util.decorators import superuser_required from postgresqleu.util.random import generate_random_token from postgresqleu.util.time import today_global from postgresqleu.invoices.util import InvoiceManager, InvoicePresentationWrapper from postgresqleu.invoices.models import InvoiceProcessor -from postgresqleu.mailqueue.util import send_simple_mail from datetime import timedelta import json diff --git a/postgresqleu/newsevents/admin.py b/postgresqleu/newsevents/admin.py index fcca4195..8f103cc6 100644 --- a/postgresqleu/newsevents/admin.py +++ b/postgresqleu/newsevents/admin.py @@ -1,7 +1,5 @@ from django.contrib import admin -from postgresqleu.util.forms import ConcurrentProtectedModelForm - from postgresqleu.newsevents.models import News, NewsPosterProfile diff --git a/postgresqleu/newsevents/feeds.py b/postgresqleu/newsevents/feeds.py index a9d6f147..90b97b01 100644 --- a/postgresqleu/newsevents/feeds.py +++ b/postgresqleu/newsevents/feeds.py @@ -4,9 +4,7 @@ from django.template.defaultfilters import slugify from django.shortcuts import get_object_or_404 from django.conf import settings -from .models import News, NewsPosterProfile - -import datetime +from .models import NewsPosterProfile from postgresqleu.util.db import exec_to_dict, ensure_conference_timezone diff --git a/postgresqleu/newsevents/management/commands/news_social_post.py b/postgresqleu/newsevents/management/commands/news_social_post.py index 3cfd9ffd..a3a9a83e 100644 --- a/postgresqleu/newsevents/management/commands/news_social_post.py +++ b/postgresqleu/newsevents/management/commands/news_social_post.py @@ -4,7 +4,7 @@ # (actually just writes it to the queue for the next job to pick up) # -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from django.template.defaultfilters import slugify from django.db import transaction from django.conf import settings diff --git a/postgresqleu/newsevents/views.py b/postgresqleu/newsevents/views.py index e9b09402..361ecff4 100644 --- a/postgresqleu/newsevents/views.py +++ b/postgresqleu/newsevents/views.py @@ -2,8 +2,6 @@ from django.shortcuts import render, get_object_or_404 from django.core import paginator from django.utils import timezone -import datetime - from postgresqleu.newsevents.models import News diff --git a/postgresqleu/paypal/management/commands/paypal_fetch.py b/postgresqleu/paypal/management/commands/paypal_fetch.py index d34ca1bf..dc1cba1b 100644 --- a/postgresqleu/paypal/management/commands/paypal_fetch.py +++ b/postgresqleu/paypal/management/commands/paypal_fetch.py @@ -9,8 +9,7 @@ # from django.core.management.base import BaseCommand -from django.db import transaction, connection -from django.conf import settings +from django.db import transaction from django.utils import timezone from datetime import datetime, timedelta diff --git a/postgresqleu/paypal/management/commands/verify_paypal_balance.py b/postgresqleu/paypal/management/commands/verify_paypal_balance.py index 971b5c49..453fdb97 100644 --- a/postgresqleu/paypal/management/commands/verify_paypal_balance.py +++ b/postgresqleu/paypal/management/commands/verify_paypal_balance.py @@ -11,7 +11,7 @@ from django.core.management.base import BaseCommand from django.db import transaction from django.conf import settings -from datetime import datetime, time +from datetime import time from postgresqleu.invoices.models import InvoicePaymentMethod from postgresqleu.paypal.util import PaypalAPI diff --git a/postgresqleu/paypal/models.py b/postgresqleu/paypal/models.py index f3e8c004..152ceff0 100644 --- a/postgresqleu/paypal/models.py +++ b/postgresqleu/paypal/models.py @@ -1,7 +1,5 @@ from django.db import models -from datetime import datetime - from postgresqleu.invoices.models import InvoicePaymentMethod diff --git a/postgresqleu/paypal/views.py b/postgresqleu/paypal/views.py index f29adbf1..b700fc18 100644 --- a/postgresqleu/paypal/views.py +++ b/postgresqleu/paypal/views.py @@ -5,7 +5,7 @@ from django.conf import settings from django.utils import timezone from decimal import Decimal -from urllib.parse import urlencode, unquote_plus +from urllib.parse import unquote_plus import requests from postgresqleu.invoices.util import InvoiceManager diff --git a/postgresqleu/scheduler/apps.py b/postgresqleu/scheduler/apps.py index 13de93c1..4e01f4ad 100644 --- a/postgresqleu/scheduler/apps.py +++ b/postgresqleu/scheduler/apps.py @@ -2,7 +2,6 @@ from django.apps import AppConfig from django.db.models.signals import post_migrate from django.db import transaction, connection from django.core.management import get_commands, load_command_class -from django.conf import settings from .util import reschedule_job diff --git a/postgresqleu/scheduler/forms.py b/postgresqleu/scheduler/forms.py index 9f685136..68176aab 100644 --- a/postgresqleu/scheduler/forms.py +++ b/postgresqleu/scheduler/forms.py @@ -1,5 +1,3 @@ -from django import forms - from postgresqleu.util.backendforms import BackendForm from .models import ScheduledJob diff --git a/postgresqleu/stripepayment/api.py b/postgresqleu/stripepayment/api.py index 774b6b94..10a4f1b8 100644 --- a/postgresqleu/stripepayment/api.py +++ b/postgresqleu/stripepayment/api.py @@ -6,7 +6,7 @@ from decimal import Decimal import requests from requests.auth import HTTPBasicAuth -from .models import StripeCheckout, StripeRefund +from .models import StripeRefund class StripeException(Exception): diff --git a/postgresqleu/stripepayment/management/commands/stripe_update_transactions.py b/postgresqleu/stripepayment/management/commands/stripe_update_transactions.py index fa654a6a..6b3f0795 100644 --- a/postgresqleu/stripepayment/management/commands/stripe_update_transactions.py +++ b/postgresqleu/stripepayment/management/commands/stripe_update_transactions.py @@ -4,10 +4,8 @@ # from django.core.management.base import BaseCommand -from django.db import transaction -from django.conf import settings -from datetime import time, datetime, timedelta +from datetime import timedelta from postgresqleu.invoices.models import InvoicePaymentMethod from postgresqleu.stripepayment.models import StripeCheckout diff --git a/postgresqleu/transferwise/management/commands/transferwise_fetch_statements.py b/postgresqleu/transferwise/management/commands/transferwise_fetch_statements.py index 44704516..e23d7936 100644 --- a/postgresqleu/transferwise/management/commands/transferwise_fetch_statements.py +++ b/postgresqleu/transferwise/management/commands/transferwise_fetch_statements.py @@ -8,7 +8,6 @@ from django.core.management.base import BaseCommand from django.db import transaction -from django.db.models import Sum from django.conf import settings import datetime diff --git a/postgresqleu/transferwise/management/commands/transferwise_fetch_transactions.py b/postgresqleu/transferwise/management/commands/transferwise_fetch_transactions.py index 8c0213ca..8ca2fc9d 100644 --- a/postgresqleu/transferwise/management/commands/transferwise_fetch_transactions.py +++ b/postgresqleu/transferwise/management/commands/transferwise_fetch_transactions.py @@ -3,7 +3,7 @@ # Copyright (C) 2019, PostgreSQL Europe # -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from django.db import transaction from django.conf import settings from django.utils import timezone diff --git a/postgresqleu/transferwise/management/commands/transferwise_send_payouts.py b/postgresqleu/transferwise/management/commands/transferwise_send_payouts.py index 1ef60e3e..e6277f4f 100644 --- a/postgresqleu/transferwise/management/commands/transferwise_send_payouts.py +++ b/postgresqleu/transferwise/management/commands/transferwise_send_payouts.py @@ -3,17 +3,13 @@ # Copyright (C) 2019, PostgreSQL Europe # -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from django.db import transaction -from django.conf import settings from django.utils import timezone -from postgresqleu.invoices.models import InvoicePaymentMethod -from postgresqleu.transferwise.models import TransferwiseTransaction, TransferwiseRefund from postgresqleu.transferwise.models import TransferwisePayout from datetime import timedelta -import re class Command(BaseCommand): diff --git a/postgresqleu/trustlypayment/management/commands/trustly_fetch_withdrawals.py b/postgresqleu/trustlypayment/management/commands/trustly_fetch_withdrawals.py index 77b06b5c..707865d1 100644 --- a/postgresqleu/trustlypayment/management/commands/trustly_fetch_withdrawals.py +++ b/postgresqleu/trustlypayment/management/commands/trustly_fetch_withdrawals.py @@ -7,11 +7,9 @@ from django.core.management.base import BaseCommand from django.db import transaction -from django.conf import settings from datetime import time, datetime, timedelta from decimal import Decimal -import dateutil from postgresqleu.accounting.util import create_accounting_entry from postgresqleu.invoices.util import is_managed_bank_account diff --git a/postgresqleu/trustlypayment/util.py b/postgresqleu/trustlypayment/util.py index 5946ff3e..a473075e 100644 --- a/postgresqleu/trustlypayment/util.py +++ b/postgresqleu/trustlypayment/util.py @@ -7,7 +7,7 @@ from decimal import Decimal from postgresqleu.mailqueue.util import send_simple_mail from postgresqleu.invoices.util import InvoiceManager -from postgresqleu.invoices.models import Invoice, InvoicePaymentMethod +from postgresqleu.invoices.models import Invoice from .api import TrustlyWrapper, TrustlyException from .models import TrustlyTransaction, TrustlyLog diff --git a/postgresqleu/urls.py b/postgresqleu/urls.py index cb91a4f7..6ca0edb8 100644 --- a/postgresqleu/urls.py +++ b/postgresqleu/urls.py @@ -36,7 +36,7 @@ import postgresqleu.util.views import postgresqleu.util.backendviews from postgresqleu.newsevents.feeds import LatestNews -from postgresqleu.confreg.feeds import LatestEvents, ConferenceNewsFeed +from postgresqleu.confreg.feeds import ConferenceNewsFeed # Uncomment the next two lines to enable the admin: # from django.contrib import admin diff --git a/postgresqleu/util/management/commands/check_messaging_integrations.py b/postgresqleu/util/management/commands/check_messaging_integrations.py index be6f0882..ab5ec0d0 100644 --- a/postgresqleu/util/management/commands/check_messaging_integrations.py +++ b/postgresqleu/util/management/commands/check_messaging_integrations.py @@ -6,9 +6,7 @@ # -from django.core.management.base import BaseCommand, CommandError -from django.db import connection, transaction -from django.utils import timezone +from django.core.management.base import BaseCommand import datetime import io diff --git a/postgresqleu/util/management/commands/fetch_media_posts.py b/postgresqleu/util/management/commands/fetch_media_posts.py index 42aff86d..6aed28ec 100644 --- a/postgresqleu/util/management/commands/fetch_media_posts.py +++ b/postgresqleu/util/management/commands/fetch_media_posts.py @@ -7,15 +7,12 @@ from django.core.management.base import BaseCommand, CommandError from django.db import connection, transaction from django.utils import timezone -from datetime import datetime, timedelta +from datetime import timedelta import sys -import time from postgresqleu.util.messaging import get_messaging from postgresqleu.util.messaging.util import store_incoming_post -from postgresqleu.confreg.models import ConferenceTweetQueue -from postgresqleu.confreg.models import ConferenceIncomingTweet, ConferenceIncomingTweetMedia from postgresqleu.confreg.models import MessagingProvider diff --git a/postgresqleu/util/management/commands/post_media_broadcasts.py b/postgresqleu/util/management/commands/post_media_broadcasts.py index 7edb3530..50fc0295 100644 --- a/postgresqleu/util/management/commands/post_media_broadcasts.py +++ b/postgresqleu/util/management/commands/post_media_broadcasts.py @@ -4,12 +4,10 @@ from django.core.management.base import BaseCommand, CommandError -from django.template.defaultfilters import slugify -from django.db import connection, transaction -from django.conf import settings +from django.db import connection from django.utils import timezone -from datetime import datetime, timedelta +from datetime import timedelta import sys from postgresqleu.util.messaging import ProviderCache diff --git a/postgresqleu/util/management/commands/session_clean.py b/postgresqleu/util/management/commands/session_clean.py index 7c5dea68..fecdedf5 100644 --- a/postgresqleu/util/management/commands/session_clean.py +++ b/postgresqleu/util/management/commands/session_clean.py @@ -2,7 +2,7 @@ # # Copyright (C) 2019, PostgreSQL Europe # -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from django.db import connection from datetime import timedelta diff --git a/postgresqleu/util/management/commands/social_media_poster.py b/postgresqleu/util/management/commands/social_media_poster.py index 053a4a32..58d3eff7 100644 --- a/postgresqleu/util/management/commands/social_media_poster.py +++ b/postgresqleu/util/management/commands/social_media_poster.py @@ -2,18 +2,11 @@ # Daemon to post all queued up notifications and social media posts # -from django.core.management.base import BaseCommand, CommandError -from django.core.management import load_command_class +from django.core.management.base import BaseCommand from django.db import connection -from django.utils import autoreload, timezone -from django.conf import settings +from django.utils import autoreload -from datetime import timedelta -import time -import io import sys -import os -import subprocess import threading import select diff --git a/postgresqleu/util/messaging/mastodon.py b/postgresqleu/util/messaging/mastodon.py index 8d71c9b0..8956c6b5 100644 --- a/postgresqleu/util/messaging/mastodon.py +++ b/postgresqleu/util/messaging/mastodon.py @@ -1,7 +1,6 @@ from django import forms from django.utils import timezone from django.utils.html import strip_tags -from django.conf import settings import requests_oauthlib import requests @@ -9,7 +8,7 @@ import dateutil.parser from postgresqleu.util.widgets import StaticTextWidget from postgresqleu.util.forms import LinkForCodeField -from postgresqleu.util.oauthapps import get_oauth_client, get_oauth_secret, has_oauth_data +from postgresqleu.util.oauthapps import get_oauth_client, get_oauth_secret from postgresqleu.util.models import OAuthApplication from postgresqleu.util.messaging import re_token diff --git a/postgresqleu/util/messaging/telegram.py b/postgresqleu/util/messaging/telegram.py index c5058c02..936493d4 100644 --- a/postgresqleu/util/messaging/telegram.py +++ b/postgresqleu/util/messaging/telegram.py @@ -1,7 +1,5 @@ from django import forms from django.http import HttpResponse -from django.db import models -from django.utils.functional import cached_property from django.utils import timezone from django.contrib import messages from django.conf import settings diff --git a/postgresqleu/util/messaging/twitter.py b/postgresqleu/util/messaging/twitter.py index 147cb59d..1b30dbeb 100644 --- a/postgresqleu/util/messaging/twitter.py +++ b/postgresqleu/util/messaging/twitter.py @@ -17,7 +17,7 @@ import base64 from postgresqleu.util.widgets import StaticTextWidget from postgresqleu.util.forms import SubmitButtonField from postgresqleu.util.forms import LinkForCodeField -from postgresqleu.util.oauthapps import get_oauth_client, get_oauth_secret, has_oauth_data +from postgresqleu.util.oauthapps import get_oauth_client, get_oauth_secret from postgresqleu.util.messaging import re_token, get_messaging from postgresqleu.util.messaging.util import send_reg_direct_message, store_incoming_post diff --git a/postgresqleu/util/misc/baseinvoice.py b/postgresqleu/util/misc/baseinvoice.py index c36a493d..4d0c597b 100755 --- a/postgresqleu/util/misc/baseinvoice.py +++ b/postgresqleu/util/misc/baseinvoice.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import os from decimal import Decimal from reportlab.pdfgen.canvas import Canvas diff --git a/postgresqleu/util/models.py b/postgresqleu/util/models.py index 87bccd5f..691165b9 100644 --- a/postgresqleu/util/models.py +++ b/postgresqleu/util/models.py @@ -1,8 +1,6 @@ # Some very simple models used by utilities from django.db import models -from .oauthapps import oauth_application_choices - class Storage(models.Model): key = models.CharField(max_length=16, null=False, blank=False) diff --git a/postgresqleu/util/payment/stripe.py b/postgresqleu/util/payment/stripe.py index de53169c..0843e6e2 100644 --- a/postgresqleu/util/payment/stripe.py +++ b/postgresqleu/util/payment/stripe.py @@ -1,8 +1,6 @@ from django import forms from django.conf import settings -import re - from postgresqleu.util.widgets import StaticTextWidget from postgresqleu.invoices.models import Invoice from postgresqleu.invoices.backendforms import BackendInvoicePaymentMethodForm diff --git a/postgresqleu/util/payment/trustly.py b/postgresqleu/util/payment/trustly.py index 1827e3e6..03b1dd54 100644 --- a/postgresqleu/util/payment/trustly.py +++ b/postgresqleu/util/payment/trustly.py @@ -1,4 +1,3 @@ -from django.conf import settings from django import forms from django.core.exceptions import ValidationError diff --git a/postgresqleu/views.py b/postgresqleu/views.py index 6da62f6c..28a1263a 100644 --- a/postgresqleu/views.py +++ b/postgresqleu/views.py @@ -5,7 +5,6 @@ from django.contrib.auth.decorators import login_required from django.utils import timezone from django.conf import settings -from postgresqleu.newsevents.models import News from postgresqleu.confreg.models import Conference, ConferenceSeries from postgresqleu.invoices.models import PendingBankTransaction, BankFileUpload, InvoicePaymentMethod from postgresqleu.invoices.models import InvoiceRefund |