update code to reflect the new minimum python version 3.7

- 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)

allianceauth/services/modules/ips4/manager.py

@@ -39,7 +39,7 @@ class Ips4Manager:
         cursor.execute(Ips4Manager.SQL_GET_ID, [username])
         row = cursor.fetchone()
         if row is not None:
-            logger.debug("Got user id %s for username %s" % (row[0], username))
+            logger.debug(f"Got user id {row[0]} for username {username}")
             return row[0]
         else:
             logger.error("username %s not found. Unable to determine id." % username)

allianceauth/services/modules/ips4/migrations/0001_initial.py

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

allianceauth/services/modules/ips4/migrations/0002_service_permissions.py

@@ -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_ips4')
 
-    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 Ips4User.objects.filter(user__groups__name=member_group_name).exists() or \
-            getattr(settings, str('ENABLE_AUTH_IPS4'), False):
+            getattr(settings, 'ENABLE_AUTH_IPS4', 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 Ips4User.objects.filter(user__groups__name=blue_group_name).exists() or \
-            getattr(settings, str('ENABLE_BLUE_IPS4'), False):
+            getattr(settings, 'ENABLE_BLUE_IPS4', False):
         try:
             group = Group.objects.get(name=blue_group_name)
             group.permissions.add(perm)

allianceauth/services/modules/ips4/models.py

@@ -15,5 +15,5 @@ class Ips4User(models.Model):
 
     class Meta:
         permissions = (
-            ("access_ips4", u"Can access the IPS4 service"),
+            ("access_ips4", "Can access the IPS4 service"),
         )

allianceauth/services/modules/ips4/tests.py

@@ -143,7 +143,7 @@ class Ips4ManagerTestCase(TestCase):
         password = self.manager._Ips4Manager__generate_random_pass()
 
         self.assertEqual(len(password), 16)
-        self.assertIsInstance(password, type(''))
+        self.assertIsInstance(password, str)
 
     def test_gen_pwhash(self):
         pwhash = self.manager._gen_pwhash('test')

allianceauth/services/modules/ips4/views.py

@@ -20,7 +20,7 @@ ACCESS_PERM = 'ips4.access_ips4'
 def activate_ips4(request):
     logger.debug("activate_ips4 called by user %s" % request.user)
     character = request.user.profile.main_character
-    logger.debug("Adding IPS4 user for user %s with main character %s" % (request.user, character))
+    logger.debug(f"Adding IPS4 user for user {request.user} with main character {character}")
     result = Ips4Manager.add_user(Ips4Tasks.get_username(request.user), request.user.email)
     # if empty we failed
     if result[0] != "" and not Ips4Tasks.has_account(request.user):