Browse Source

fix(api): use corrects settings object

Peter Thomassen 1 year ago
parent
commit
50b3ac89d3

+ 1 - 4
api/desecapi/management/commands/limit.py

@@ -1,9 +1,6 @@
 from django.core.management import BaseCommand, CommandError
-from django.db.models import Q
 
-from api import settings
-from desecapi.models import RRset, Domain, User
-from desecapi.pdns_change_tracker import PDNSChangeTracker
+from desecapi.models import Domain, User
 
 
 class Command(BaseCommand):

+ 1 - 1
api/desecapi/management/commands/stop-abuse.py

@@ -1,8 +1,8 @@
 import dns.resolver
+from django.conf import settings
 from django.core.management import BaseCommand
 from django.db.models import Q
 
-from api import settings
 from desecapi.models import BlockedSubnet, Domain, RR, RRset, User
 from desecapi.pdns_change_tracker import PDNSChangeTracker
 

+ 1 - 1
api/desecapi/serializers/authenticated_actions.py

@@ -2,11 +2,11 @@ import binascii
 import json
 from datetime import timedelta
 
+from django.conf import settings
 from rest_framework import fields, serializers
 from rest_framework.settings import api_settings
 from rest_framework.validators import UniqueValidator, qs_filter
 
-from api import settings
 from desecapi import crypto, models
 
 from .captcha import CaptchaSolutionSerializer

+ 1 - 1
api/desecapi/serializers/captcha.py

@@ -2,9 +2,9 @@ from base64 import b64encode
 
 from captcha.audio import AudioCaptcha
 from captcha.image import ImageCaptcha
+from django.conf import settings
 from rest_framework import serializers
 
-from api import settings
 from desecapi.models import Captcha
 
 

+ 1 - 1
api/desecapi/serializers/domains.py

@@ -1,8 +1,8 @@
 import dns.name
 import dns.zone
+from django.conf import settings
 from rest_framework import serializers
 
-from api import settings
 from desecapi.models import Domain, RR_SET_TYPES_AUTOMATIC
 from desecapi.validators import ReadOnlyOnUpdateValidator
 

+ 1 - 1
api/desecapi/serializers/records.py

@@ -3,6 +3,7 @@ import copy
 import django.core.exceptions
 import dns.name
 import dns.zone
+from django.conf import settings
 from django.core.validators import MinValueValidator
 from django.db.models import F, Q
 from django.utils import timezone
@@ -11,7 +12,6 @@ from rest_framework import serializers
 from rest_framework.settings import api_settings
 from rest_framework.validators import UniqueTogetherValidator
 
-from api import settings
 from desecapi import metrics, models, validators
 
 

+ 1 - 1
api/desecapi/tests/test_captcha.py

@@ -3,13 +3,13 @@ from io import BytesIO
 from unittest import mock
 
 from PIL import Image
+from django.conf import settings
 from django.test import TestCase
 from django.utils import timezone
 from rest_framework import status
 from rest_framework.reverse import reverse
 from rest_framework.test import APIClient
 
-from api import settings
 from desecapi.models import Captcha
 from desecapi.serializers import CaptchaSolutionSerializer
 from desecapi.tests.base import DesecTestCase

+ 1 - 1
api/desecapi/tests/test_stop_abuse.py

@@ -1,6 +1,6 @@
+from django.conf import settings
 from django.core import management
 
-from api import settings
 from desecapi import models
 from desecapi.tests.base import DomainOwnerTestCase
 

+ 1 - 1
api/desecapi/tests/test_user_management.py

@@ -21,6 +21,7 @@ from unittest import mock
 from urllib.parse import urlparse
 
 from django.contrib.auth.hashers import is_password_usable
+from django.conf import settings
 from django.core import mail
 from django.core.management import call_command
 from django.urls import resolve
@@ -29,7 +30,6 @@ from rest_framework import status
 from rest_framework.reverse import reverse
 from rest_framework.test import APIClient
 
-from api import settings
 from desecapi.models import Domain, User, Captcha
 from desecapi.tests.base import (
     DesecTestCase,