Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-11 17:46: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

4
allianceauth/srp/managers.py
View File

@@ -42,11 +42,11 @@ class SRPManager:
if km:
ship_type = km['victim']['ship_type_id']
logger.debug(
"Ship type for kill ID %s is %s" % (kill_id, ship_type)
f"Ship type for kill ID {kill_id} is {ship_type}"
)
ship_value = result['zkb']['totalValue']
logger.debug(
"Total loss value for kill id %s is %s" % (kill_id, ship_value)
f"Total loss value for kill id {kill_id} is {ship_value}"
)
victim_id = km['victim']['character_id']
return ship_type, ship_value, victim_id

1
allianceauth/srp/migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.1 on 2016-09-05 21:40
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion

1
allianceauth/srp/migrations/0002_srpuserrequest_srp_status_choices.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.5 on 2017-01-18 20:21
from __future__ import unicode_literals
from django.db import migrations, models

1
allianceauth/srp/migrations/0003_make_strings_more_stringy.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.10.5 on 2017-03-22 23:35
from __future__ import unicode_literals
from django.db import migrations, models

1
allianceauth/srp/migrations/0004_on_delete.py
View File

@@ -1,5 +1,4 @@
# Generated by Django 1.11.5 on 2017-09-28 02:16
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion

2
allianceauth/srp/models.py
View File

@@ -18,7 +18,7 @@ class SrpFleetMain(models.Model):
@property
def total_cost(self):
return sum([int(r.srp_total_amount) for r in self.srpuserrequest_set.all()])
return sum(int(r.srp_total_amount) for r in self.srpuserrequest_set.all())
@property
def pending_requests(self):

2
allianceauth/srp/tests/test_managers.py
View File

@@ -22,7 +22,7 @@ currentdir = os.path.dirname(os.path.abspath(inspect.getfile(
def load_data(filename):
"""loads given JSON file from `testdata` sub folder and returns content"""
with open(
currentdir + '/testdata/%s.json' % filename, 'r', encoding='utf-8'
currentdir + '/testdata/%s.json' % filename, encoding='utf-8'
) as f:
data = json.load(f)

58
allianceauth/srp/views.py
View File

@@ -47,7 +47,7 @@ def srp_management(request, all=False):
@login_required
@permission_required('srp.access_srp')
def srp_fleet_view(request, fleet_id):
logger.debug("srp_fleet_view called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_view called by user {request.user} for fleet id {fleet_id}")
try:
fleet_main = SrpFleetMain.objects.get(id=fleet_id)
except SrpFleetMain.DoesNotExist:
@@ -81,7 +81,7 @@ def srp_fleet_add_view(request):
completed = True
completed_srp_code = srp_fleet_main.fleet_srp_code
logger.info("Created SRP Fleet %s by user %s" % (srp_fleet_main.fleet_name, request.user))
logger.info(f"Created SRP Fleet {srp_fleet_main.fleet_name} by user {request.user}")
messages.success(request, _('Created SRP fleet %(fleetname)s.') % {"fleetname": srp_fleet_main.fleet_name})
else:
@@ -96,10 +96,10 @@ def srp_fleet_add_view(request):
@login_required
@permission_required('auth.srp_management')
def srp_fleet_remove(request, fleet_id):
logger.debug("srp_fleet_remove called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_remove called by user {request.user} for fleet id {fleet_id}")
srpfleetmain = get_object_or_404(SrpFleetMain, id=fleet_id)
srpfleetmain.delete()
logger.info("SRP Fleet %s deleted by user %s" % (srpfleetmain.fleet_name, request.user))
logger.info(f"SRP Fleet {srpfleetmain.fleet_name} deleted by user {request.user}")
messages.success(request, _('Removed SRP fleet %(fleetname)s.') % {"fleetname": srpfleetmain.fleet_name})
return redirect("srp:management")
@@ -107,11 +107,11 @@ def srp_fleet_remove(request, fleet_id):
@login_required
@permission_required('auth.srp_management')
def srp_fleet_disable(request, fleet_id):
logger.debug("srp_fleet_disable called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_disable called by user {request.user} for fleet id {fleet_id}")
srpfleetmain = get_object_or_404(SrpFleetMain, id=fleet_id)
srpfleetmain.fleet_srp_code = ""
srpfleetmain.save()
logger.info("SRP Fleet %s disabled by user %s" % (srpfleetmain.fleet_name, request.user))
logger.info(f"SRP Fleet {srpfleetmain.fleet_name} disabled by user {request.user}")
messages.success(request, _('Disabled SRP fleet %(fleetname)s.') % {"fleetname": srpfleetmain.fleet_name})
return redirect("srp:management")
@@ -119,11 +119,11 @@ def srp_fleet_disable(request, fleet_id):
@login_required
@permission_required('auth.srp_management')
def srp_fleet_enable(request, fleet_id):
logger.debug("srp_fleet_enable called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_enable called by user {request.user} for fleet id {fleet_id}")
srpfleetmain = get_object_or_404(SrpFleetMain, id=fleet_id)
srpfleetmain.fleet_srp_code = random_string(8)
srpfleetmain.save()
logger.info("SRP Fleet %s enable by user %s" % (srpfleetmain.fleet_name, request.user))
logger.info(f"SRP Fleet {srpfleetmain.fleet_name} enable by user {request.user}")
messages.success(request, _('Enabled SRP fleet %(fleetname)s.') % {"fleetname": srpfleetmain.fleet_name})
return redirect("srp:management")
@@ -131,11 +131,11 @@ def srp_fleet_enable(request, fleet_id):
@login_required
@permission_required('auth.srp_management')
def srp_fleet_mark_completed(request, fleet_id):
logger.debug("srp_fleet_mark_completed called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_mark_completed called by user {request.user} for fleet id {fleet_id}")
srpfleetmain = get_object_or_404(SrpFleetMain, id=fleet_id)
srpfleetmain.fleet_srp_status = "Completed"
srpfleetmain.save()
logger.info("Marked SRP Fleet %s as completed by user %s" % (srpfleetmain.fleet_name, request.user))
logger.info(f"Marked SRP Fleet {srpfleetmain.fleet_name} as completed by user {request.user}")
messages.success(request,
_('Marked SRP fleet %(fleetname)s as completed.') % {"fleetname": srpfleetmain.fleet_name})
return redirect("srp:fleet", fleet_id)
@@ -144,11 +144,11 @@ def srp_fleet_mark_completed(request, fleet_id):
@login_required
@permission_required('auth.srp_management')
def srp_fleet_mark_uncompleted(request, fleet_id):
logger.debug("srp_fleet_mark_uncompleted called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_mark_uncompleted called by user {request.user} for fleet id {fleet_id}")
srpfleetmain = get_object_or_404(SrpFleetMain, id=fleet_id)
srpfleetmain.fleet_srp_status = ""
srpfleetmain.save()
logger.info("Marked SRP Fleet %s as incomplete for user %s" % (fleet_id, request.user))
logger.info(f"Marked SRP Fleet {fleet_id} as incomplete for user {request.user}")
messages.success(request,
_('Marked SRP fleet %(fleetname)s as incomplete.') % {"fleetname": srpfleetmain.fleet_name})
return redirect("srp:fleet", fleet_id)
@@ -157,10 +157,10 @@ def srp_fleet_mark_uncompleted(request, fleet_id):
@login_required
@permission_required('srp.access_srp')
def srp_request_view(request, fleet_srp):
logger.debug("srp_request_view called by user %s for fleet srp code %s" % (request.user, fleet_srp))
logger.debug(f"srp_request_view called by user {request.user} for fleet srp code {fleet_srp}")
if SrpFleetMain.objects.filter(fleet_srp_code=fleet_srp).exists() is False:
logger.error("Unable to locate SRP Fleet using code %s for user %s" % (fleet_srp, request.user))
logger.error(f"Unable to locate SRP Fleet using code {fleet_srp} for user {request.user}")
messages.error(request,
_('Unable to locate SRP code with ID %(srpfleetid)s') % {"srpfleetid": fleet_srp})
return redirect("srp:management")
@@ -193,7 +193,7 @@ def srp_request_view(request, fleet_srp):
srp_kill_link = SRPManager.get_kill_id(srp_request.killboard_link)
(ship_type_id, ship_value, victim_id) = SRPManager.get_kill_data(srp_kill_link)
except ValueError:
logger.debug("User %s Submitted Invalid Killmail Link %s or server could not be reached" % (
logger.debug("User {} Submitted Invalid Killmail Link {} or server could not be reached".format(
request.user, srp_request.killboard_link))
# THIS SHOULD BE IN FORM VALIDATION
messages.error(request,
@@ -205,7 +205,7 @@ def srp_request_view(request, fleet_srp):
srp_request.kb_total_loss = ship_value
srp_request.post_time = post_time
srp_request.save()
logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (
logger.info("Created SRP Request on behalf of user {} for fleet name {}".format(
request.user, srp_fleet_main.fleet_name))
messages.success(request,
_('Submitted SRP request for your %(ship)s.') % {"ship": srp_request.srp_ship_name})
@@ -228,7 +228,7 @@ def srp_request_view(request, fleet_srp):
@permission_required('auth.srp_management')
def srp_request_remove(request):
numrequests = len(request.POST) - 1
logger.debug("srp_request_remove called by user %s for %s srp request id's" % (request.user, numrequests))
logger.debug(f"srp_request_remove called by user {request.user} for {numrequests} srp request id's")
stored_fleet_view = None
for srp_request_id in request.POST:
if numrequests == 0:
@@ -240,7 +240,7 @@ def srp_request_remove(request):
srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id)
stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.delete()
logger.info("Deleted SRP request id %s for user %s" % (srp_request_id, request.user))
logger.info(f"Deleted SRP request id {srp_request_id} for user {request.user}")
if stored_fleet_view is None:
logger.error("Unable to delete srp requests for user %s - request matching id not found." % (request.user))
messages.error(request, _('Unable to locate selected SRP request.'))
@@ -254,7 +254,7 @@ def srp_request_remove(request):
@permission_required('auth.srp_management')
def srp_request_approve(request):
numrequests = len(request.POST) - 1
logger.debug("srp_request_approve called by user %s for %s srp request id's" % (request.user, numrequests))
logger.debug(f"srp_request_approve called by user {request.user} for {numrequests} srp request id's")
stored_fleet_view = None
for srp_request_id in request.POST:
if numrequests == 0:
@@ -269,13 +269,13 @@ def srp_request_approve(request):
if srpuserrequest.srp_total_amount == 0:
srpuserrequest.srp_total_amount = srpuserrequest.kb_total_loss
srpuserrequest.save()
logger.info("Approved SRP request id %s for character %s by user %s" % (
logger.info("Approved SRP request id {} for character {} by user {}".format(
srp_request_id, srpuserrequest.character, request.user))
notify(
srpuserrequest.character.character_ownership.user,
'SRP Request Approved',
level='success',
message='Your SRP request for a %s lost during %s has been approved for %s ISK.' % (
message='Your SRP request for a {} lost during {} has been approved for {} ISK.'.format(
srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name,
intcomma(srpuserrequest.srp_total_amount))
)
@@ -292,7 +292,7 @@ def srp_request_approve(request):
@permission_required('auth.srp_management')
def srp_request_reject(request):
numrequests = len(request.POST) - 1
logger.debug("srp_request_reject called by user %s for %s srp request id's" % (request.user, numrequests))
logger.debug(f"srp_request_reject called by user {request.user} for {numrequests} srp request id's")
stored_fleet_view = None
for srp_request_id in request.POST:
if numrequests == 0:
@@ -305,13 +305,13 @@ def srp_request_reject(request):
stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.srp_status = "Rejected"
srpuserrequest.save()
logger.info("SRP request id %s for character %s rejected by %s" % (
logger.info("SRP request id {} for character {} rejected by {}".format(
srp_request_id, srpuserrequest.character, request.user))
notify(
srpuserrequest.character.character_ownership.user,
'SRP Request Rejected',
level='danger',
message='Your SRP request for a %s lost during %s has been rejected.' % (
message='Your SRP request for a {} lost during {} has been rejected.'.format(
srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name)
)
if stored_fleet_view is None:
@@ -326,11 +326,11 @@ def srp_request_reject(request):
@login_required
@permission_required('auth.srp_management')
def srp_request_update_amount(request, fleet_srp_request_id):
logger.debug("srp_request_update_amount called by user %s for fleet srp request id %s" % (
logger.debug("srp_request_update_amount called by user {} for fleet srp request id {}".format(
request.user, fleet_srp_request_id))
if SrpUserRequest.objects.filter(id=fleet_srp_request_id).exists() is False:
logger.error("Unable to locate SRP request id %s for user %s" % (fleet_srp_request_id, request.user))
logger.error(f"Unable to locate SRP request id {fleet_srp_request_id} for user {request.user}")
messages.error(request,
_('Unable to locate SRP request with ID %(requestid)s') % {"requestid": fleet_srp_request_id})
return redirect("srp:management")
@@ -338,7 +338,7 @@ def srp_request_update_amount(request, fleet_srp_request_id):
srp_request = SrpUserRequest.objects.get(id=fleet_srp_request_id)
srp_request.srp_total_amount = request.POST['value']
srp_request.save()
logger.info("Updated srp request id %s total to %s by user %s" % (
logger.info("Updated srp request id {} total to {} by user {}".format(
fleet_srp_request_id, request.POST['value'], request.user))
return JsonResponse({"success": True, "pk": fleet_srp_request_id, "newValue": request.POST['value']})
@@ -346,7 +346,7 @@ def srp_request_update_amount(request, fleet_srp_request_id):
@login_required
@permission_required('auth.srp_management')
def srp_fleet_edit_view(request, fleet_id):
logger.debug("srp_fleet_edit_view called by user %s for fleet id %s" % (request.user, fleet_id))
logger.debug(f"srp_fleet_edit_view called by user {request.user} for fleet id {fleet_id}")
srpfleetmain = get_object_or_404(SrpFleetMain, id=fleet_id)
if request.method == 'POST':
form = SrpFleetMainUpdateForm(request.POST)
@@ -354,7 +354,7 @@ def srp_fleet_edit_view(request, fleet_id):
if form.is_valid():
srpfleetmain.fleet_srp_aar_link = form.cleaned_data['fleet_aar_link']
srpfleetmain.save()
logger.info("User %s edited SRP Fleet %s" % (request.user, srpfleetmain.fleet_name))
logger.info(f"User {request.user} edited SRP Fleet {srpfleetmain.fleet_name}")
messages.success(request,
_('Saved changes to SRP fleet %(fleetname)s') % {"fleetname": srpfleetmain.fleet_name})
return redirect("srp:management")