misc: bump black version (#75442)

This commit is contained in:
Valentin Deniaud 2023-03-15 16:21:57 +01:00
parent bfc3a65097
commit f1104382b6
252 changed files with 5 additions and 262 deletions

View File

@ -12,10 +12,10 @@ repos:
- id: django-upgrade
args: ['--target-version', '3.2']
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 23.1.0
hooks:
- id: black
args: ['--target-version', 'py37', '--skip-string-normalization', '--line-length', '110']
args: ['--target-version', 'py39', '--skip-string-normalization', '--line-length', '110']
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:

View File

@ -121,6 +121,7 @@ LOGGING = {
A2_OPENED_SESSION_COOKIE_SECURE = True
# Old settings method
def extract_settings_from_environ():
import json

View File

@ -252,8 +252,8 @@ class RoleParentingManager(models.Manager):
while True:
changed = False
for (i, j) in list(indirects):
for (k, l) in direct:
for i, j in list(indirects):
for k, l in direct:
if j == k and i != l and (i, l) not in indirects:
indirects.add((i, l))
changed = True

View File

@ -6,7 +6,6 @@ import authentic2.utils.misc
class Migration(migrations.Migration):
dependencies = [
('authentic2', '0004_service'),
('django_rbac', '__first__'),

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0001_initial'),
]

View File

@ -4,7 +4,6 @@ from authentic2.migrations import CreatePartialIndexes
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0002_role_external_id'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0003_partial_unique_index_on_name_and_slug'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0004_auto_20150523_0028'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0005_auto_20150526_1406'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0006_auto_20150619_1056'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0007_auto_20150708_1337'),
]

View File

@ -4,7 +4,6 @@ from authentic2.migrations import CreatePartialIndexes
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0008_auto_20150810_1953'),
]

View File

@ -39,7 +39,6 @@ def noop(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0009_partial_unique_index_on_permission'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0010_auto_20160209_1417'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0011_auto_20160209_1511'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0013_auto_20170629_0007'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0014_auto_20170711_1024'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0015_organizationalunit_validate_emails'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0016_auto_20171208_1429'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0017_organizationalunit_user_can_reset_password'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0018_organizationalunit_user_add_password_policy'),
]

View File

@ -4,7 +4,6 @@ from authentic2.migrations import CreatePartialIndexes
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0019_organizationalunit_show_username'),
]

View File

@ -6,7 +6,6 @@ import authentic2.a2_rbac.utils
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0020_partial_unique_index_on_name'),
]

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0021_auto_20200317_1514'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0022_auto_20200402_1101'),
]

View File

@ -30,7 +30,6 @@ def update_self_administration_perm(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0023_role_can_manage_members'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0024_fix_self_admin_perm'),
]

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0028_ou_home_url'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0025_auto_20210622_1132'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0026_organizationalunit_check_required_on_login_attributes'),
]

View File

@ -6,7 +6,6 @@ import authentic2.validators
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0026_add_roleparenting_soft_delete'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0027_auto_20211213_0949'),
]

View File

@ -6,7 +6,6 @@ from authentic2.migrations import DropPartialIndexes
class Migration(migrations.Migration):
dependencies = [
('authentic2', '0039_add_unique_attribute_constraint'),
('contenttypes', '0002_remove_content_type_name'),

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0029_use_unique_constraints'),
]

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0030_organizationalunit_min_password_strength'),
]

View File

@ -32,7 +32,6 @@ def reverse_copy_operations_data(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0031_new_operation_model'),
('django_rbac', '0009_auto_20221004_1343'),

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0032_copy_operations_data'),
]

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0033_remove_old_operation_fk'),
]

View File

@ -51,7 +51,6 @@ def reverse_populate_role_fields(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0034_new_role_fields'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0035_populate_role_fields'),
]

View File

@ -78,7 +78,6 @@ class AbstractBase(models.Model):
class OrganizationalUnit(AbstractBase):
RESET_LINK_POLICY = 0
MANUAL_PASSWORD_POLICY = 1

View File

@ -242,7 +242,6 @@ class Register(BaseRpcView):
token = utils_misc.get_hex_uuid()[:16]
final_return_url = utils_misc.make_url(validated_data['return_url'], params={'token': token})
if email and not validated_data.get('no_email_validation'):
registration_template = ['authentic2/activation_email']
if validated_data['ou']:
registration_template.insert(0, 'authentic2/activation_email_%s' % validated_data['ou'].slug)

View File

@ -10,7 +10,6 @@ import authentic2.utils.evaluate
class Migration(migrations.Migration):
initial = True
dependencies = [

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authenticators', '0001_initial'),
]

View File

@ -22,7 +22,6 @@ def create_login_password_authenticator(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('authenticators', '0002_loginpasswordauthenticator'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authenticators', '0003_auto_20220413_1504'),
]

View File

@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.RBAC_ROLE_MODEL),
('authenticators', '0004_auto_20220726_1708'),

View File

@ -10,7 +10,6 @@ from django.utils import timezone
class Migration(migrations.Migration):
initial = True
dependencies = [

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('journal', '0001_initial'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('auth', '0002_auto_20150323_1720'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('attribute_aggregator', '0001_initial'),

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('attribute_aggregator', '0002_auto_20150409_1840'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('idp', '0003_auto_20150915_2041'),
('attribute_aggregator', '0003_auto_20150526_2239'),

View File

@ -4,7 +4,6 @@ from django.utils import timezone
class Migration(migrations.Migration):
dependencies = [
('contenttypes', '__first__'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('auth', '0001_initial'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('auth', '0002_auto_20150323_1720'),

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('auth', '0003_auto_20150410_1657'),
('authentic2', '__first__'),

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('auth', '0004_user'),
]

View File

@ -80,7 +80,6 @@ def copy_old_users_to_custom_user_model(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('auth', '__first__'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0002_auto_20150410_1823'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.RBAC_OU_MODEL),
('custom_user', '0003_auto_20150504_1410'),

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0004_user_ou'),
]

View File

@ -11,7 +11,6 @@ def set_last_login(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0005_auto_20150522_1527'),
]

View File

@ -11,7 +11,6 @@ def set_last_login(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0006_auto_20150527_1212'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0007_auto_20150610_1527'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0008_auto_20150617_1606'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0009_auto_20150810_1953'),
]

View File

@ -6,7 +6,6 @@ def create_attribute_value_for_names(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('contenttypes', '__first__'),
('custom_user', '0010_auto_20160307_1418'),

View File

@ -5,7 +5,6 @@ from django.utils.timezone import utc
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0011_manual_attribute_values_for_name_fields'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0012_user_modified'),
]

View File

@ -11,7 +11,6 @@ def set_email_verified(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0013_user_email_verified'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0014_set_email_verified'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0015_auto_20170707_1653'),
]

View File

@ -6,7 +6,6 @@ import authentic2.validators
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0016_auto_20180925_1107'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0017_auto_20200305_1645'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0018_user_last_account_deletion_alert'),
]

View File

@ -5,7 +5,6 @@ from django.db.models import JSONField
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0019_add_user_deleted'),
]

View File

@ -16,7 +16,6 @@ def set_unusable_password(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0020_deleteduser'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0024_index_email_by_trigrams'),
]

View File

@ -40,7 +40,6 @@ def delete_users(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0025_user_deactivation'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0026_remove_user_deleted'),
]

View File

@ -10,7 +10,6 @@ from django.db.models import JSONField
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0028_user_email_verified_date'),
]

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authentic2', '0035_service_home_url'),
('custom_user', '0029_profile_profiletype'),

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0030_auto_20220304_1136'),
]

View File

@ -6,7 +6,6 @@ import authentic2.validators
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0032_index_deleteduser_old_email'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0032_index_deleteduser_old_uuid'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0031_profile_email'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0032_auto_20220919_1230'),
]

View File

@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0033_user_keepalive'),
]

View File

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('custom_user', '0034_user_email_verified_sources'),
]

View File

@ -159,7 +159,6 @@ def disco(request):
# Not back from the selection interface
else:
# Discovery request parameters
entityID = request.GET.get('entityID', '')
_return = request.GET.get('return', '')

View File

@ -126,7 +126,6 @@ class PickerWidgetMixin:
render_template = BOOTSTRAP_INPUT_TEMPLATE
def __init__(self, attrs=None, options=None, usel10n=None):
if attrs is None:
attrs = {}
@ -195,7 +194,6 @@ class DateTimeWidget(PickerWidgetMixin, DateTimeInput):
glyphicon = 'glyphicon-th'
def __init__(self, attrs=None, options=None, usel10n=None):
if options is None:
options = {}
@ -217,7 +215,6 @@ class DateWidget(PickerWidgetMixin, DateInput):
render_template = BOOTSTRAP_DATE_INPUT_TEMPLATE
def __init__(self, attrs=None, options=None, usel10n=None):
if options is None:
options = {}
@ -245,7 +242,6 @@ class TimeWidget(PickerWidgetMixin, TimeInput):
glyphicon = 'glyphicon-time'
def __init__(self, attrs=None, options=None, usel10n=None):
if options is None:
options = {}
@ -352,7 +348,6 @@ class PhoneNumberInput(TextInput):
class EmailInput(BaseEmailInput):
template_name = 'authentic2/widgets/email.html'
@property

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('attribute_aggregator', '__first__'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('idp', '0001_initial'),
]

View File

@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('saml', '0016_auto_20150915_2041'),
('idp', '0002_auto_20150526_2239'),

View File

@ -74,7 +74,6 @@ listing = APIClientsView.as_view()
class APIClientDetailView(APIClientsMixin, DetailView):
template_name = 'authentic2/manager/api_client_detail.html'
@property

View File

@ -93,7 +93,6 @@ class LimitQuerysetFormMixin(FormWithRequest):
class ChooseUserForm(LimitQuerysetFormMixin, CssClass, forms.Form):
user = fields.ChooseUserField(label=_('Add an user'))
action = forms.CharField(initial='add', widget=forms.HiddenInput)
@ -106,13 +105,11 @@ class ChooseUserForm(LimitQuerysetFormMixin, CssClass, forms.Form):
class ChooseRoleForm(LimitQuerysetFormMixin, CssClass, forms.Form):
role = fields.ChooseRoleField(label=_('Add a role'))
action = forms.CharField(initial='add', widget=forms.HiddenInput)
class UsersForm(LimitQuerysetFormMixin, CssClass, forms.Form):
users = fields.ChooseUsersField(label=_('Add some users'))

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('auth', '0002_auto_20150323_1720'),
('contenttypes', '0001_initial'),

View File

@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authentic2', '0001_initial'),
]

View File

@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('authentic2', '0002_auto_20150320_1418'),

Some files were not shown because too many files have changed in this diff Show More