Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-16 20:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

update code to reflect the new minimum python version 3.7

Browse Source 
- update string format method
- remove redundant default arguments from function  calls
- remove unused imports
- remove unicode identifier from strings, it's default in py3 (see: https://stackoverflow.com/a/4182635/12201331)
This commit is contained in:
Peter Pfeufer
2021-10-18 11:59:05 +02:00
parent 2fe1de1c97
commit a6b340c179
199 changed files with 499 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
allianceauth/services/modules/teamspeak3/auth_hooks.py
View File

@@ -21,15 +21,15 @@ class Teamspeak3Service(ServicesHook):
self.name_format = '[{corp_ticker}]{character_name}'
def delete_user(self, user, notify_user=False):
logger.debug('Deleting user %s %s account' % (user, self.name))
logger.debug(f'Deleting user {user} {self.name} account')
return Teamspeak3Tasks.delete_user(user, notify_user=notify_user)
def update_groups(self, user):
logger.debug('Updating %s groups for %s' % (self.name, user))
logger.debug(f'Updating {self.name} groups for {user}')
Teamspeak3Tasks.update_groups.delay(user.pk)
def validate_user(self, user):
logger.debug('Validating user %s %s account' % (user, self.name))
logger.debug(f'Validating user {user} {self.name} account')
if Teamspeak3Tasks.has_account(user) and not self.service_active_for_user(user):
self.delete_user(user, notify_user=True)

40
allianceauth/services/modules/teamspeak3/manager.py
View File

@@ -55,7 +55,7 @@ class Teamspeak3Manager:
try:
ret = self.server.send_command('customsearch', {'ident': 'sso_uid', 'pattern': uid})
if ret and 'keys' in ret and 'cldbid' in ret['keys']:
logger.debug("Got userid %s for uid %s" % (ret['keys']['cldbid'], uid))
logger.debug("Got userid {} for uid {}".format(ret['keys']['cldbid'], uid))
return ret['keys']['cldbid']
except TeamspeakError as e:
if not e.code == '1281':
@@ -71,7 +71,7 @@ class Teamspeak3Manager:
continue
logger.debug("Checking group %s" % group)
if group['keys']['name'] == groupname:
logger.debug("Found group %s, returning id %s" % (groupname, group['keys']['sgid']))
logger.debug("Found group {}, returning id {}".format(groupname, group['keys']['sgid']))
return group['keys']['sgid']
logger.debug("Group %s not found on server." % groupname)
return None
@@ -93,7 +93,7 @@ class Teamspeak3Manager:
self.server.send_command('servergroupaddperm',
{'sgid': sgid, 'permsid': 'i_group_needed_member_remove_power', 'permvalue': 100,
'permnegated': 0, 'permskip': 0})
logger.info("Created group on TS3 server with name %s and id %s" % (groupname, sgid))
logger.info(f"Created group on TS3 server with name {groupname} and id {sgid}")
return sgid
def _user_group_list(self, cldbid):
@@ -128,7 +128,7 @@ class Teamspeak3Manager:
for group in group_cache:
if group['keys']['type'] != '1':
continue
logger.debug("Assigning name/id dict: %s = %s" % (group['keys']['name'], group['keys']['sgid']))
logger.debug("Assigning name/id dict: {} = {}".format(group['keys']['name'], group['keys']['sgid']))
outlist[group['keys']['name']] = group['keys']['sgid']
else:
logger.error("Received empty group cache while retrieving group cache from TS3 server. 1024 error.")
@@ -136,24 +136,24 @@ class Teamspeak3Manager:
return outlist
def _add_user_to_group(self, uid, groupid):
logger.debug("Adding group id %s to TS3 user id %s" % (groupid, uid))
logger.debug(f"Adding group id {groupid} to TS3 user id {uid}")
user_groups = self._user_group_list(uid)
if groupid not in user_groups.values():
logger.debug("User does not have group already. Issuing command to add.")
self.server.send_command('servergroupaddclient',
{'sgid': str(groupid), 'cldbid': uid})
logger.info("Added user id %s to group id %s on TS3 server." % (uid, groupid))
logger.info(f"Added user id {uid} to group id {groupid} on TS3 server.")
def _remove_user_from_group(self, uid, groupid):
logger.debug("Removing group id %s from TS3 user id %s" % (groupid, uid))
logger.debug(f"Removing group id {groupid} from TS3 user id {uid}")
user_groups = self._user_group_list(uid)
if str(groupid) in user_groups.values():
logger.debug("User is in group. Issuing command to remove.")
self.server.send_command('servergroupdelclient',
{'sgid': str(groupid), 'cldbid': uid})
logger.info("Removed user id %s from group id %s on TS3 server." % (uid, groupid))
logger.info(f"Removed user id {uid} from group id {groupid} on TS3 server.")
def _sync_ts_group_db(self):
logger.debug("_sync_ts_group_db function called.")
@@ -162,20 +162,20 @@ class Teamspeak3Manager:
local_groups = TSgroup.objects.all()
logger.debug("Comparing remote groups to TSgroup objects: %s" % local_groups)
for key in remote_groups:
logger.debug("Typecasting remote_group value at position %s to int: %s" % (key, remote_groups[key]))
logger.debug(f"Typecasting remote_group value at position {key} to int: {remote_groups[key]}")
remote_groups[key] = int(remote_groups[key])
for group in local_groups:
logger.debug("Checking local group %s" % group)
if group.ts_group_id not in remote_groups.values():
logger.debug(
"Local group id %s not found on server. Deleting model %s" % (group.ts_group_id, group))
f"Local group id {group.ts_group_id} not found on server. Deleting model {group}")
TSgroup.objects.filter(ts_group_id=group.ts_group_id).delete()
for key in remote_groups:
g = TSgroup(ts_group_id=remote_groups[key], ts_group_name=key)
q = TSgroup.objects.filter(ts_group_id=g.ts_group_id)
if not q:
logger.debug("Local group does not exist for TS group %s. Creating TSgroup model %s" % (
logger.debug("Local group does not exist for TS group {}. Creating TSgroup model {}".format(
remote_groups[key], g))
g.save()
except TeamspeakError as e:
@@ -199,7 +199,7 @@ class Teamspeak3Manager:
'tokendescription': username_clean,
'tokencustomset': "ident=sso_uid value=%s" % username_clean})
except TeamspeakError as e:
logger.error("Failed to add teamspeak user %s: %s" % (username_clean, str(e)))
logger.error(f"Failed to add teamspeak user {username_clean}: {str(e)}")
return "",""
try:
@@ -207,12 +207,12 @@ class Teamspeak3Manager:
logger.info("Created permission token for user %s on TS3 server" % username_clean)
return username_clean, token
except:
logger.exception("Failed to add teamspeak user %s - received response: %s" % (username_clean, ret))
logger.exception(f"Failed to add teamspeak user {username_clean} - received response: {ret}")
return "", ""
def delete_user(self, uid):
user = self._get_userid(uid)
logger.debug("Deleting user %s with id %s from TS3 server." % (user, uid))
logger.debug(f"Deleting user {user} with id {uid} from TS3 server.")
if user:
clients = self.server.send_command('clientlist')
if isinstance(clients, dict):
@@ -226,18 +226,18 @@ class Teamspeak3Manager:
self.server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5,
'reasonmsg': 'Auth service deleted'})
except:
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, client))
logger.exception(f"Failed to delete user id {uid} from TS3 - received response {client}")
return False
try:
ret = self.server.send_command('clientdbdelete', {'cldbid': user})
except TeamspeakError as e:
logger.error("Failed to delete teamspeak user %s: %s" % (uid, str(e)))
logger.error(f"Failed to delete teamspeak user {uid}: {str(e)}")
return False
if ret == '0':
logger.info("Deleted user with id %s from TS3 server." % uid)
return True
else:
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, ret))
logger.exception(f"Failed to delete user id {uid} from TS3 - received response {ret}")
return False
else:
logger.warn("User with id %s not found on TS3 server. Assuming succesful deletion." % uid)
@@ -255,7 +255,7 @@ class Teamspeak3Manager:
return self.add_user(user, username)
def update_groups(self, uid, ts_groups):
logger.debug("Updating uid %s TS3 groups %s" % (uid, ts_groups))
logger.debug(f"Updating uid {uid} TS3 groups {ts_groups}")
userid = self._get_userid(uid)
addgroups = []
remgroups = []
@@ -273,9 +273,9 @@ class Teamspeak3Manager:
remgroups.append(user_ts_groups[user_ts_group_key])
for g in addgroups:
logger.info("Adding Teamspeak user %s into group %s" % (userid, g))
logger.info(f"Adding Teamspeak user {userid} into group {g}")
self._add_user_to_group(userid, g)
for g in remgroups:
logger.info("Removing Teamspeak user %s from group %s" % (userid, g))
logger.info(f"Removing Teamspeak user {userid} from group {g}")
self._remove_user_from_group(userid, g)

1
allianceauth/services/modules/teamspeak3/migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.2 on 2016-12-12 01:11
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models

1
allianceauth/services/modules/teamspeak3/migrations/0002_auto_20161212_0133.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.2 on 2016-12-12 01:33
from __future__ import unicode_literals
from django.db import migrations

1
allianceauth/services/modules/teamspeak3/migrations/0003_teamspeak3user.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.2 on 2016-12-12 03:14
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models

9
allianceauth/services/modules/teamspeak3/migrations/0004_service_permissions.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.5 on 2017-02-02 05:59
from __future__ import unicode_literals
from django.db import migrations
from django.conf import settings
@@ -23,12 +22,12 @@ def migrate_service_enabled(apps, schema_editor):
perm = Permission.objects.get(codename='access_teamspeak3')
member_group_name = getattr(settings, str('DEFAULT_AUTH_GROUP'), 'Member')
blue_group_name = getattr(settings, str('DEFAULT_BLUE_GROUP'), 'Blue')
member_group_name = getattr(settings, 'DEFAULT_AUTH_GROUP', 'Member')
blue_group_name = getattr(settings, 'DEFAULT_BLUE_GROUP', 'Blue')
# Migrate members
if Teamspeak3User.objects.filter(user__groups__name=member_group_name).exists() or \
getattr(settings, str('ENABLE_AUTH_TEAMSPEAK3'), False):
getattr(settings, 'ENABLE_AUTH_TEAMSPEAK3', False):
try:
group = Group.objects.get(name=member_group_name)
group.permissions.add(perm)
@@ -37,7 +36,7 @@ def migrate_service_enabled(apps, schema_editor):
# Migrate blues
if Teamspeak3User.objects.filter(user__groups__name=blue_group_name).exists() or \
getattr(settings, str('ENABLE_BLUE_TEAMSPEAK3'), False):
getattr(settings, 'ENABLE_BLUE_TEAMSPEAK3', False):
try:
group = Group.objects.get(name=blue_group_name)
group.permissions.add(perm)

1
allianceauth/services/modules/teamspeak3/migrations/0005_stategroup.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.11.10 on 2018-02-23 06:13
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion

2
allianceauth/services/modules/teamspeak3/models.py
View File

@@ -16,7 +16,7 @@ class Teamspeak3User(models.Model):
class Meta:
permissions = (
("access_teamspeak3", u"Can access the Teamspeak3 service"),
("access_teamspeak3", "Can access the Teamspeak3 service"),
)

4
allianceauth/services/modules/teamspeak3/signals.py
View File

@@ -19,7 +19,7 @@ def trigger_all_ts_update():
@receiver(m2m_changed, sender=AuthTS.ts_group.through)
def m2m_changed_authts_group(sender, instance, action, *args, **kwargs):
logger.debug("Received m2m_changed from %s ts_group with action %s" % (instance, action))
logger.debug(f"Received m2m_changed from {instance} ts_group with action {action}")
if action == "post_add" or action == "post_remove":
transaction.on_commit(trigger_all_ts_update)
@@ -45,5 +45,5 @@ post_delete.connect(post_delete_authts, sender=StateGroup)
def check_groups_on_state_change(sender, user, state, **kwargs):
def trigger_update():
Teamspeak3Tasks.update_groups.delay(user.pk)
logger.debug("Received state_changed signal from {}".format(user))
logger.debug(f"Received state_changed signal from {user}")
transaction.on_commit(trigger_update)

6
allianceauth/services/modules/teamspeak3/tasks.py
View File

@@ -20,7 +20,7 @@ class Teamspeak3Tasks:
@classmethod
def delete_user(cls, user, notify_user=False):
if cls.has_account(user):
logger.debug("User %s has TS3 account %s. Deleting." % (user, user.teamspeak3.uid))
logger.debug(f"User {user} has TS3 account {user.teamspeak3.uid}. Deleting.")
with Teamspeak3Manager() as ts3man:
if ts3man.delete_user(user.teamspeak3.uid):
user.teamspeak3.delete()
@@ -71,13 +71,13 @@ class Teamspeak3Tasks:
groups[ts_group.ts_group_name] = ts_group.ts_group_id
for stategroup in user.profile.state.stategroup_set.all():
groups[stategroup.ts_group.ts_group_name] = stategroup.ts_group.ts_group_id
logger.debug("Updating user %s teamspeak3 groups to %s" % (user, groups))
logger.debug(f"Updating user {user} teamspeak3 groups to {groups}")
try:
with Teamspeak3Manager() as ts3man:
ts3man.update_groups(user.teamspeak3.uid, groups)
logger.debug("Updated user %s teamspeak3 groups." % user)
except TeamspeakError as e:
logger.error("Error occured while syncing TS groups for %s: %s" % (user, str(e)))
logger.error(f"Error occured while syncing TS groups for {user}: {str(e)}")
raise self.retry(countdown=60*10)
else:
logger.debug("User does not have a teamspeak3 account")

8
allianceauth/services/modules/teamspeak3/util/ts3.py
View File

@@ -8,7 +8,7 @@ class ConnectionError:
self.port = port
def __str__(self):
return 'Error connecting to host %s port %s' % (self.ip, self.port)
return f'Error connecting to host {self.ip} port {self.port}'
ts3_escape = {
@@ -32,7 +32,7 @@ class TS3Proto:
EOL = b'\n\r'
def __init__(self):
self._log = logging.getLogger('%s.%s' % (__name__, self.__class__.__name__))
self._log = logging.getLogger(f'{__name__}.{self.__class__.__name__}')
self._conn = None
self._connected = False
@@ -122,10 +122,10 @@ class TS3Proto:
if isinstance(keys[key], list):
ncstr = []
for nest in keys[key]:
ncstr.append("%s=%s" % (key, self._escape_str(nest)))
ncstr.append(f"{key}={self._escape_str(nest)}")
cstr.append("|".join(ncstr))
else:
cstr.append("%s=%s" % (key, self._escape_str(keys[key])))
cstr.append(f"{key}={self._escape_str(keys[key])}")
# Add in options
if opts:

2
allianceauth/services/modules/teamspeak3/views.py
View File

@@ -24,7 +24,7 @@ def activate_teamspeak3(request):
character = request.user.profile.main_character
with Teamspeak3Manager() as ts3man:
logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character))
logger.debug(f"Adding TS3 user for user {request.user} with main character {character}")
result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
# if its empty we failed