Skip to content

Commit 5b6311d

Browse files
spapasspapas
committed
Format with lack
1 parent 85d3163 commit 5b6311d

36 files changed

+705
-237
lines changed

‎etsd/core/migrations/0001_initial.py

+16-6
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,28 @@ class Migration(migrations.Migration):
77

88
initial = True
99

10-
dependencies = [
11-
]
10+
dependencies = []
1211

1312
operations = [
1413
migrations.CreateModel(
15-
name='GlobalPermissionHolder',
14+
name="GlobalPermissionHolder",
1615
fields=[
17-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
16+
(
17+
"id",
18+
models.AutoField(
19+
auto_created=True,
20+
primary_key=True,
21+
serialize=False,
22+
verbose_name="ID",
23+
),
24+
),
1825
],
1926
options={
20-
'permissions': (('user', 'Application user'), ('admin', 'Application admin')),
21-
'managed': False,
27+
"permissions": (
28+
("user", "Application user"),
29+
("admin", "Application admin"),
30+
),
31+
"managed": False,
2232
},
2333
),
2434
]

‎etsd/core/models.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ class GlobalPermissionHolder(models.Model):
88
"A non-managed model to be used as a holder for global permissions"
99

1010
class Meta:
11-
managed = (
12-
False
13-
) # No database table creation or deletion operations will be performed for this model.
11+
managed = False # No database table creation or deletion operations will be performed for this model.
1412
permissions = (("user", "Application user"), ("admin", "Application admin"))
1513

1614

‎etsd/core/templatetags/core_tags.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ def get_setting_value(value):
1212
@register.simple_tag(takes_context=True)
1313
def get_user_authority(context):
1414
auth = context.request.user.get_authority()
15-
return auth.name if auth else None
15+
return auth.name if auth else None

‎etsd/core/tests/sample.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class SampleTestCase(TestCase):
5-
65
def setUp(self):
76
self.value = 1
87

‎etsd/core/urls.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
urlpatterns = [
66
path(r"", TemplateView.as_view(template_name="home.html"), name="home"),
77
path(r"login/", LoginView.as_view(), name="auth_login"),
8-
path(r"logout/", LogoutView.as_view(template_name="logout.html"), name="auth_logout"),
8+
path(
9+
r"logout/", LogoutView.as_view(template_name="logout.html"), name="auth_logout"
10+
),
911
]

‎etsd/keys/apps.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33

44
class KeysConfig(AppConfig):
5-
default_auto_field = 'django.db.models.BigAutoField'
6-
name = 'etsd.keys'
5+
default_auto_field = "django.db.models.BigAutoField"
6+
name = "etsd.keys"

‎etsd/keys/filters.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ class PublicKeyFilter(django_filters.FilterSet):
77
class Meta:
88
model = models.PublicKey
99
fields = {
10-
'authority__name': ['icontains'],
11-
'status': ['exact'],
12-
'fingerprint': ['icontains'],
10+
"authority__name": ["icontains"],
11+
"status": ["exact"],
12+
"fingerprint": ["icontains"],
1313
}
1414

1515
def __init__(self, *args, **kwargs):

‎etsd/keys/forms.py

+17-16
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,36 @@
99
class PublicKeyCreateForm(forms.ModelForm):
1010
class Meta:
1111
model = models.PublicKey
12-
fields = ('key', 'fingerprint', 'confirmation_document')
13-
12+
fields = ("key", "fingerprint", "confirmation_document")
13+
1414
def __init__(self, *args, **kwargs):
1515
super(PublicKeyCreateForm, self).__init__(*args, **kwargs)
16-
self.fields['fingerprint'].widget.attrs['readonly'] = True
17-
16+
self.fields["fingerprint"].widget.attrs["readonly"] = True
17+
1818
def clean(self):
1919
data = self.cleaned_data
20-
if models.PublicKey.objects.filter(fingerprint=data['fingerprint']).exists():
21-
raise forms.ValidationError(_('Public key with that fingerprint already exists.'))
22-
20+
if models.PublicKey.objects.filter(fingerprint=data["fingerprint"]).exists():
21+
raise forms.ValidationError(
22+
_("Public key with that fingerprint already exists.")
23+
)
24+
2325
gpg = gnupg.GPG(gnupghome=settings.GNUPG_HOME)
24-
gkey = gpg.import_keys(data['key'])
26+
gkey = gpg.import_keys(data["key"])
2527
if not gkey.fingerprints:
26-
raise forms.ValidationError(_('Invalid public key.'))
28+
raise forms.ValidationError(_("Invalid public key."))
2729

2830
calculated_fingerprint = gkey.fingerprints[0].lower()
29-
if calculated_fingerprint != data['fingerprint'].lower():
30-
raise forms.ValidationError(_('Submitted public key fingerprint is not correct!'))
31-
31+
if calculated_fingerprint != data["fingerprint"].lower():
32+
raise forms.ValidationError(
33+
_("Submitted public key fingerprint is not correct!")
34+
)
3235

3336
confirmation_document = data.get("confirmation_document")
3437
if confirmation_document:
35-
r = check_signatures(confirmation_document, [1,2,3,4])
38+
r = check_signatures(confirmation_document, [1, 2, 3, 4])
3639
if r:
3740
raise forms.ValidationError(r)
3841
else:
39-
raise forms.ValidationError(_('Confirmation document is required.'))
40-
42+
raise forms.ValidationError(_("Confirmation document is required."))
4143

4244
return data
43-

‎etsd/keys/migrations/0001_initial.py

+67-13
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,80 @@ class Migration(migrations.Migration):
1111

1212
dependencies = [
1313
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14-
('authorities', '0003_authority_email'),
14+
("authorities", "0003_authority_email"),
1515
]
1616

1717
operations = [
1818
migrations.CreateModel(
19-
name='PublicKey',
19+
name="PublicKey",
2020
fields=[
21-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
22-
('created_on', models.DateTimeField(auto_now_add=True, verbose_name='Created on')),
23-
('modified_on', models.DateTimeField(auto_now=True, verbose_name='Modified on')),
24-
('key', models.TextField()),
25-
('fingerprint', models.CharField(max_length=128, unique=True)),
26-
('status', models.CharField(choices=[('ACTIVE', 'Active'), ('PENDING', 'Pending'), ('INACTIVE', 'Inactive')], default='PENDING', max_length=10)),
27-
('confirmation_document', models.FileField(blank=True, null=True, upload_to='confirmations/%Y/%m/%d/')),
28-
('authority', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='authorities.authority')),
29-
('created_by', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='publickey_created', to=settings.AUTH_USER_MODEL, verbose_name='Created by')),
30-
('modified_by', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='publickey_modified', to=settings.AUTH_USER_MODEL, verbose_name='Modified by')),
21+
(
22+
"id",
23+
models.BigAutoField(
24+
auto_created=True,
25+
primary_key=True,
26+
serialize=False,
27+
verbose_name="ID",
28+
),
29+
),
30+
(
31+
"created_on",
32+
models.DateTimeField(auto_now_add=True, verbose_name="Created on"),
33+
),
34+
(
35+
"modified_on",
36+
models.DateTimeField(auto_now=True, verbose_name="Modified on"),
37+
),
38+
("key", models.TextField()),
39+
("fingerprint", models.CharField(max_length=128, unique=True)),
40+
(
41+
"status",
42+
models.CharField(
43+
choices=[
44+
("ACTIVE", "Active"),
45+
("PENDING", "Pending"),
46+
("INACTIVE", "Inactive"),
47+
],
48+
default="PENDING",
49+
max_length=10,
50+
),
51+
),
52+
(
53+
"confirmation_document",
54+
models.FileField(
55+
blank=True, null=True, upload_to="confirmations/%Y/%m/%d/"
56+
),
57+
),
58+
(
59+
"authority",
60+
models.ForeignKey(
61+
on_delete=django.db.models.deletion.PROTECT,
62+
to="authorities.authority",
63+
),
64+
),
65+
(
66+
"created_by",
67+
models.ForeignKey(
68+
editable=False,
69+
on_delete=django.db.models.deletion.PROTECT,
70+
related_name="publickey_created",
71+
to=settings.AUTH_USER_MODEL,
72+
verbose_name="Created by",
73+
),
74+
),
75+
(
76+
"modified_by",
77+
models.ForeignKey(
78+
editable=False,
79+
on_delete=django.db.models.deletion.PROTECT,
80+
related_name="publickey_modified",
81+
to=settings.AUTH_USER_MODEL,
82+
verbose_name="Modified by",
83+
),
84+
),
3185
],
3286
options={
33-
'abstract': False,
87+
"abstract": False,
3488
},
3589
),
3690
]

‎etsd/keys/migrations/0002_auto_20210729_1438.py

+32-12
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,47 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('keys', '0001_initial'),
9+
("keys", "0001_initial"),
1010
]
1111

1212
operations = [
1313
migrations.AlterModelOptions(
14-
name='publickey',
15-
options={'verbose_name': 'Public key', 'verbose_name_plural': 'Public keys'},
14+
name="publickey",
15+
options={
16+
"verbose_name": "Public key",
17+
"verbose_name_plural": "Public keys",
18+
},
1619
),
1720
migrations.AlterField(
18-
model_name='publickey',
19-
name='fingerprint',
20-
field=models.CharField(help_text='The fingerprint of the key will be automatically generated after the key is validated', max_length=128, unique=True, verbose_name='Key fingerprint'),
21+
model_name="publickey",
22+
name="fingerprint",
23+
field=models.CharField(
24+
help_text="The fingerprint of the key will be automatically generated after the key is validated",
25+
max_length=128,
26+
unique=True,
27+
verbose_name="Key fingerprint",
28+
),
2129
),
2230
migrations.AlterField(
23-
model_name='publickey',
24-
name='key',
25-
field=models.TextField(help_text='Please paste the key text in armored format ASCII', verbose_name='Key text'),
31+
model_name="publickey",
32+
name="key",
33+
field=models.TextField(
34+
help_text="Please paste the key text in armored format ASCII",
35+
verbose_name="Key text",
36+
),
2637
),
2738
migrations.AlterField(
28-
model_name='publickey',
29-
name='status',
30-
field=models.CharField(choices=[('ACTIVE', 'Active'), ('PENDING', 'Pending'), ('INACTIVE', 'Inactive')], default='PENDING', help_text='Approval status of key', max_length=10),
39+
model_name="publickey",
40+
name="status",
41+
field=models.CharField(
42+
choices=[
43+
("ACTIVE", "Active"),
44+
("PENDING", "Pending"),
45+
("INACTIVE", "Inactive"),
46+
],
47+
default="PENDING",
48+
help_text="Approval status of key",
49+
max_length=10,
50+
),
3151
),
3252
]

‎etsd/keys/migrations/0003_alter_publickey_confirmation_document.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('keys', '0002_auto_20210729_1438'),
9+
("keys", "0002_auto_20210729_1438"),
1010
]
1111

1212
operations = [
1313
migrations.AlterField(
14-
model_name='publickey',
15-
name='confirmation_document',
16-
field=models.FileField(default='', upload_to='confirmations/%Y/%m/%d/'),
14+
model_name="publickey",
15+
name="confirmation_document",
16+
field=models.FileField(default="", upload_to="confirmations/%Y/%m/%d/"),
1717
preserve_default=False,
1818
),
1919
]

‎etsd/keys/migrations/0004_auto_20210801_1722.py

+26-10
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,39 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('keys', '0003_alter_publickey_confirmation_document'),
9+
("keys", "0003_alter_publickey_confirmation_document"),
1010
]
1111

1212
operations = [
1313
migrations.AddField(
14-
model_name='publickey',
15-
name='approved_on',
16-
field=models.DateTimeField(blank=True, null=True, verbose_name='Approval date'),
14+
model_name="publickey",
15+
name="approved_on",
16+
field=models.DateTimeField(
17+
blank=True, null=True, verbose_name="Approval date"
18+
),
1719
),
1820
migrations.AlterField(
19-
model_name='publickey',
20-
name='confirmation_document',
21-
field=models.FileField(upload_to='confirmations/%Y/%m/%d/', verbose_name='Confirmation document'),
21+
model_name="publickey",
22+
name="confirmation_document",
23+
field=models.FileField(
24+
upload_to="confirmations/%Y/%m/%d/",
25+
verbose_name="Confirmation document",
26+
),
2227
),
2328
migrations.AlterField(
24-
model_name='publickey',
25-
name='status',
26-
field=models.CharField(choices=[('ACTIVE', 'Active'), ('PENDING', 'Pending'), ('INACTIVE', 'Inactive'), ('REJECTED', 'Rejected')], default='PENDING', help_text='Approval status of key', max_length=10, verbose_name='Status'),
29+
model_name="publickey",
30+
name="status",
31+
field=models.CharField(
32+
choices=[
33+
("ACTIVE", "Active"),
34+
("PENDING", "Pending"),
35+
("INACTIVE", "Inactive"),
36+
("REJECTED", "Rejected"),
37+
],
38+
default="PENDING",
39+
help_text="Approval status of key",
40+
max_length=10,
41+
verbose_name="Status",
42+
),
2743
),
2844
]

‎etsd/keys/migrations/0005_alter_publickey_confirmation_document.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('keys', '0004_auto_20210801_1722'),
9+
("keys", "0004_auto_20210801_1722"),
1010
]
1111

1212
operations = [
1313
migrations.AlterField(
14-
model_name='publickey',
15-
name='confirmation_document',
16-
field=models.FileField(upload_to='public/confirmations/%Y/%m/%d/', verbose_name='Confirmation document'),
14+
model_name="publickey",
15+
name="confirmation_document",
16+
field=models.FileField(
17+
upload_to="public/confirmations/%Y/%m/%d/",
18+
verbose_name="Confirmation document",
19+
),
1720
),
1821
]

‎etsd/keys/models.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class PublicKey(UserDateAbstractModel):
3333
help_text=_("Approval status of key"),
3434
)
3535
confirmation_document = models.FileField(
36-
upload_to="public/confirmations/%Y/%m/%d/", verbose_name=_("Confirmation document")
36+
upload_to="public/confirmations/%Y/%m/%d/",
37+
verbose_name=_("Confirmation document"),
3738
)
3839
approved_on = models.DateTimeField(
3940
null=True, blank=True, verbose_name=_("Approval date")

0 commit comments

Comments
 (0)