Skip to content

Commit f6629c7

Browse files
committed
sort imports
1 parent 97059d3 commit f6629c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+250
-163
lines changed

announce/views.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
#
22
# Views for issueing announcements to all active members.
33
#
4+
from datetime import date
5+
from datetime import datetime
46
from functools import partial
5-
from datetime import date, datetime
67

7-
from django.shortcuts import render
8+
import django.forms as forms
89
from django.conf import settings
910
from django.contrib.admin.views.decorators import staff_member_required
10-
import django.forms as forms
1111
from django.db.models import Q
12+
from django.shortcuts import render
1213

13-
from members.models import get_active_members, members_due_for_bank_collection, KindOfMembership
14+
from members.models import KindOfMembership
15+
from members.models import get_active_members
16+
from members.models import members_due_for_bank_collection
1417

1518

1619
def _announce_filter_collection(users):

cal/admin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from django.contrib import admin
22

3-
from .models import Event, Category, Location
4-
3+
from .models import Category
4+
from .models import Event
5+
from .models import Location
56

67
admin.site.register(Event)
78
admin.site.register(Category)

cal/forms.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
from django.forms import ModelForm
2-
import django.forms as forms
1+
import re
32

4-
from django.forms.fields import SplitDateTimeField
3+
import django.forms as forms
4+
import requests
55
from django.contrib.admin.widgets import AdminSplitDateTime
6+
from django.forms import ModelForm
7+
from django.forms.fields import SplitDateTimeField
8+
69
from .models import Event
7-
import re
8-
import requests
910

1011

1112
class EventForm(ModelForm):

cal/migrations/0001_initial.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
from django.db import models, migrations
21
import datetime
2+
33
from django.conf import settings
4+
from django.db import migrations
5+
from django.db import models
46

57

68
class Migration(migrations.Migration):

cal/migrations/0002_event_advertise.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 3.2.16 on 2022-11-25 21:08
22

3-
from django.db import migrations, models
3+
from django.db import migrations
4+
from django.db import models
45

56

67
class Migration(migrations.Migration):

cal/migrations/0003_alter_event_advertise.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 3.2.20 on 2024-02-24 15:30
22

3-
from django.db import migrations, models
3+
from django.db import migrations
4+
from django.db import models
45

56

67
class Migration(migrations.Migration):

cal/models.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
import sys
2-
import urllib.parse
31
import datetime
42
import locale
5-
6-
from icalendar import Event as icalEvent
7-
from icalendar.prop import vDatetime
3+
import sys
4+
import urllib.parse
85

96
from django.conf import settings
107
from django.contrib.auth.models import User
118
from django.contrib.sites.models import Site
129
from django.db import models
1310
from django.db.models import Q
1411
from django.urls import reverse
12+
from icalendar import Event as icalEvent
13+
from icalendar.prop import vDatetime
14+
15+
from core.models import Category
16+
from core.models import Location
1517

16-
from core.models import Category, Location
1718
from . import create_calendar
1819

1920
# We want our calendar to be displayed using the German locale

cal/templatetags/cal_tags.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
from cal.models import Event
55

6-
76
register = template.Library()
87

98

cal/tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
from datetime import datetime, timedelta
21
import unittest
2+
from datetime import datetime
3+
from datetime import timedelta
34

45
from django.contrib.auth.models import User
56
from django.core.exceptions import ValidationError
67
from django.test import TestCase
78
from django.test.client import Client
89

10+
from .feeds import EventFeed
911
from .forms import EventForm
1012
from .models import Event
11-
from .feeds import EventFeed
12-
1313

1414
correct_data = {'name': 'TestEvent1',
1515
'teaser': 'Event des Jahres',

cal/urls.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import datetime
2+
from functools import partial
23

3-
from django.urls import path, re_path
4+
from django.urls import path
5+
from django.urls import re_path
46
from django.views.generic.dates import YearArchiveView
57
from django.views.generic.detail import DetailView
6-
from functools import partial
78

8-
from .models import Event
99
import cal.views
1010

11+
from .models import Event
1112

1213
date_dict = {
1314
'queryset': Event.all.all(),

cal/views.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
from datetime import date
21
import json
32
import urllib.parse
3+
from calendar import HTMLCalendar
4+
from calendar import month_name
5+
from datetime import date
46

5-
from calendar import HTMLCalendar, month_name
67
from dateutil import relativedelta
7-
88
from django.contrib.auth.decorators import login_required
9-
from django.shortcuts import render, get_object_or_404
10-
from django.http import HttpResponse, HttpResponseNotAllowed, Http404
119
from django.core.exceptions import ObjectDoesNotExist
10+
from django.http import Http404
11+
from django.http import HttpResponse
12+
from django.http import HttpResponseNotAllowed
13+
from django.shortcuts import get_object_or_404
14+
from django.shortcuts import render
1215
from django.utils import timezone
1316
from django.utils.html import conditional_escape as esc
1417
from django.utils.safestring import mark_safe
1518

16-
from .forms import EventForm
17-
from .models import Event, Category, Location
1819
from . import create_calendar
20+
from .forms import EventForm
21+
from .models import Category
22+
from .models import Event
23+
from .models import Location
1924

2025

2126
class EventCalendar(HTMLCalendar):

core/middleware.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
from core.utils import human_readable_time
1414

15-
1615
TAG = '<!-- footer_stats -->'
1716
FOOTER_STAT_STRING = 'renderd in %(render_time)s - %(queries)s sql queries'
1817

core/migrations/0001_initial.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from django.db import models, migrations
1+
from django.db import migrations
2+
from django.db import models
23

34

45
class Migration(migrations.Migration):

members/admin.py

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,39 @@
1-
from datetime import datetime
21
import csv
2+
from datetime import datetime
33

4-
5-
from django.utils.translation import gettext_lazy as _
64
import sepaxml
5+
from django.conf import settings
76
from django.contrib import admin
7+
from django.contrib import messages
8+
from django.contrib.admin.models import LogEntry
9+
from django.contrib.auth.admin import UserAdmin
810
from django.contrib.auth.forms import UserCreationForm
9-
from django.db import transaction
1011
from django.contrib.auth.models import User
11-
from django.db.models import Q
12+
from django.db import transaction
1213
from django.db.models import OuterRef
13-
from django.contrib.admin.models import LogEntry
14+
from django.db.models import Q
1415
from django.db.models import Subquery
1516
from django.http import HttpResponse
16-
from django.contrib.auth.admin import UserAdmin
1717
from django.template.loader import get_template
18-
from django.conf import settings
19-
from django.contrib import messages
20-
from members.models import members_due_for_bank_collection
18+
from django.utils.translation import gettext_lazy as _
2119

22-
from .models import BankCollectionMode, ContactInfo, KindOfMembership
23-
from .models import Locker, MailinglistMail, MembershipFee, MembershipPeriod
24-
from .models import Payment, PaymentInfo, PendingPayment, BankImportMatcher
20+
from members.models import members_due_for_bank_collection
2521
from things.models import ThingUser
2622

27-
from .views import generate_sepa, SepaException
23+
from .models import BankCollectionMode
24+
from .models import BankImportMatcher
25+
from .models import ContactInfo
26+
from .models import KindOfMembership
27+
from .models import Locker
28+
from .models import MailinglistMail
29+
from .models import MembershipFee
30+
from .models import MembershipPeriod
31+
from .models import Payment
32+
from .models import PaymentInfo
33+
from .models import PendingPayment
34+
from .views import SepaException
35+
from .views import generate_sepa
36+
2837

2938
class ContactInfoInline(admin.StackedInline):
3039
model = ContactInfo

members/forms.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import django.forms as forms
2-
32
from django.contrib.auth.models import User
43
from django.forms.models import ModelForm
54

members/management/commands/generate_many_members.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import datetime
2+
3+
from dateutil.relativedelta import relativedelta
24
from django.core.management.base import BaseCommand
35
from django.db import transaction
46

5-
from dateutil.relativedelta import relativedelta
6-
from ...models import PaymentMethod, User
77
from ...models import ContactInfo
88
from ...models import KindOfMembership
9-
from ...models import Payment
109
from ...models import MembershipPeriod
10+
from ...models import Payment
11+
from ...models import PaymentMethod
12+
from ...models import User
1113

1214

1315
class Command(BaseCommand):

members/management/commands/list_intern_emails.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django.core.management.base import BaseCommand
22

3-
from members.models import get_mailinglist_members
43
from members.models import MailinglistMail
4+
from members.models import get_mailinglist_members
55

66

77
class Command(BaseCommand):

members/management/commands/member_categories.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
from collections import defaultdict
2+
from datetime import date
3+
14
from django.core.management.base import LabelCommand
25
from django.db.models import Q
36

4-
from datetime import date
5-
67
from ...models import get_active_members_for
78

8-
from collections import defaultdict
9-
109

1110
class Command(LabelCommand):
1211
help = "My shiny new management command."

members/middleware.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.contrib.auth import logout
22
from django.utils.deprecation import MiddlewareMixin
33

4+
45
class DeactivateUserMiddleware(MiddlewareMixin):
56
def process_request(self, request):
67
if request.user.is_authenticated and not request.user.is_active:

members/migrations/0001_initial.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
from django.db import models, migrations
21
from decimal import Decimal
3-
import members.models
2+
43
from django.conf import settings
4+
from django.db import migrations
5+
from django.db import models
6+
7+
import members.models
58

69

710
class Migration(migrations.Migration):

members/migrations/0002_auto_20221112_1256.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 3.2.16 on 2022-11-12 12:56
22

3-
from django.db import migrations, models
3+
from django.db import migrations
4+
from django.db import models
45

56

67
class Migration(migrations.Migration):

members/migrations/0003_auto_20221112_1308.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 3.2.16 on 2022-11-12 13:08
22

3-
from django.db import migrations, models
3+
from django.db import migrations
4+
from django.db import models
45

56

67
class Migration(migrations.Migration):

members/migrations/0004_auto_20221112_1422.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Generated by Django 3.2.16 on 2022-11-12 14:22
22

33
import django.core.validators
4-
from django.db import migrations, models
4+
from django.db import migrations
5+
from django.db import models
56

67

78
class Migration(migrations.Migration):

members/migrations/0005_mailinglistmail.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 3.2.16 on 2022-11-12 19:11
22

3-
from django.db import migrations, models
3+
from django.db import migrations
4+
from django.db import models
45

56

67
class Migration(migrations.Migration):

members/migrations/0006_alter_contactinfo_last_email_ok.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Generated by Django 3.2.16 on 2022-11-25 23:55
22

3-
from django.db import migrations, models
3+
from django.db import migrations
4+
from django.db import models
45

56

67
class Migration(migrations.Migration):

members/migrations/0007_alter_contactinfo_image.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Generated by Django 3.2.20 on 2023-07-08 15:04
22

3-
from django.db import migrations
43
import easy_thumbnails.fields
4+
from django.db import migrations
5+
56
import members.models
67

78

members/migrations/0008_pendingpayment.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Generated by Django 3.2.20 on 2023-07-08 15:04
22

3-
from django.conf import settings
4-
from django.db import migrations, models
53
import django.db.models.deletion
4+
from django.conf import settings
5+
from django.db import migrations
6+
from django.db import models
67

78

89
class Migration(migrations.Migration):

0 commit comments

Comments
 (0)