@@ -14,7 +14,7 @@ from django.contrib.auth.models import User
from django_registration.forms import RegistrationForm
from layerindex.models import SecurityQuestion, UserProfile
-import settings
+from django.conf import settings
class CaptchaRegistrationForm(RegistrationForm):
@@ -28,7 +28,7 @@ from layerindex.auth_forms import (CaptchaPasswordResetForm,
from .models import SecurityQuestion, SecurityQuestionAnswer, UserProfile
from . import tasks
-import settings
+from django.conf import settings
@method_decorator(never_cache, name='dispatch')
class CaptchaRegistrationView(RegistrationView):
@@ -96,7 +96,7 @@ def main():
sys.exit(1)
utils.setup_django()
- import settings
+ from django.conf import settings
branch = utils.get_branch('master')
fetchdir = settings.LAYER_FETCH_DIR
@@ -12,7 +12,7 @@ from django.db.models import Q
from datetime import datetime
def layerindex_context(request):
- import settings
+ from django.conf import settings
site = Site.objects.get_current()
if site and site.name and site.name != 'example.com':
site_name = site.name
@@ -20,7 +20,7 @@ from django_registration.validators import (DEFAULT_RESERVED_NAMES,
ReservedNameValidator,
validate_confusables)
-import settings
+from django.conf import settings
from layerindex.models import (Branch, ClassicRecipe,
LayerBranch, LayerItem, LayerMaintainer,
LayerNote, RecipeChange, RecipeChangeset,
@@ -16,7 +16,7 @@ import re
class LayerConfParse:
def __init__(self, enable_tracking=False, logger=None, bitbakepath=None, tinfoil=None):
- import settings
+ from django.conf import settings
self.logger = logger
if not bitbakepath:
@@ -10,8 +10,6 @@ from django.utils.deprecation import MiddlewareMixin
from django.http import HttpResponseRedirect
from django.urls import reverse
from reversion.middleware import RevisionMiddleware
-import settings
-import re
class NonAtomicRevisionMiddleware(RevisionMiddleware):
atomic = False
@@ -37,7 +37,6 @@ def main():
from django.conf import settings
from layerindex.models import LayerItem, Recipe
from django.db import transaction
- import settings
from layerindex.utils import is_commit_ancestor
setup_environ(settings)
@@ -17,12 +17,12 @@ import shlex
from datetime import datetime
try:
- import settings
+ from django.conf import settings
except ImportError:
# not in a full django env, so settings is inaccessible.
# setup django to access settings.
utils.setup_django()
- import settings
+ from django.conf import settings
tasks = Celery('layerindex',
broker=settings.RABBIT_BROKER,
@@ -44,7 +44,6 @@ def main():
options, args = parser.parse_args(sys.argv)
utils.setup_django()
- import settings
from layerindex.models import Recipe
from django.db import transaction
@@ -95,7 +95,7 @@ def main():
sys.exit(1)
utils.setup_django()
- import settings
+ from django.conf import settings
from layerindex.models import LayerItem, LayerBranch, Recipe, ClassicRecipe, Machine, BBAppend, BBClass
from django.db import transaction
@@ -270,7 +270,7 @@ def main():
github_login = None
github_password = None
- import settings
+ from django.conf import settings
from layerindex.models import LayerItem, LayerBranch, LayerDependency, LayerMaintainer
from django.db import transaction
@@ -533,7 +533,7 @@ def import_specfiles(specfiles, layerbranch, existing, updateobj, reldir):
def import_pkgspec(args):
utils.setup_django()
- import settings
+ from django.conf import settings
from layerindex.models import LayerItem, LayerBranch, Recipe, ClassicRecipe, Machine, BBAppend, BBClass, ComparisonRecipeUpdate
from django.db import transaction
@@ -595,7 +595,7 @@ def import_pkgspec(args):
def try_specfile(args):
utils.setup_django()
- import settings
+ from django.conf import settings
from layerindex.models import LayerItem, LayerBranch, Recipe, ClassicRecipe, Machine, BBAppend, BBClass
from django.db import transaction
@@ -642,7 +642,7 @@ def try_specfile(args):
def import_deblist(args):
utils.setup_django()
- import settings
+ from django.conf import settings
from layerindex.models import LayerItem, LayerBranch, Recipe, ClassicRecipe, Machine, BBAppend, BBClass
from django.db import transaction
@@ -160,7 +160,7 @@ class ImportProject:
def add_core(self, layers):
utils.setup_django()
core = None
- import settings
+ from django.conf import settings
for layer in layers:
layer_name = self.get_layer_name(layer)
if layer_name == settings.CORE_LAYER_NAME:
@@ -72,7 +72,6 @@ def main():
args = parser.parse_args()
utils.setup_django()
- import settings
from layerindex.models import Branch, LayerBranch, LayerItem, YPCompatibleVersion
from django.db import transaction
@@ -194,7 +194,7 @@ def main():
sys.exit(1)
utils.setup_django()
- import settings
+ from django.conf import settings
from layerindex.models import Branch, LayerItem, Update, LayerUpdate, LayerBranch
logger.setLevel(options.loglevel)
@@ -295,7 +295,7 @@ def main():
options.reload = True
utils.setup_django()
- import settings
+ from django.conf import settings
from layerindex.models import (LayerItem, LayerBranch, LayerDependency,
Recipe, RecipeFileDependency, Machine,
Distro, BBAppend, BBClass,
@@ -186,7 +186,7 @@ def _add_dependency(var, name, layerbranch, config_data, logger=None, required=T
layerdep.save()
if need_remove:
- import settings
+ from django.conf import settings
remove_layer_dependencies = getattr(settings, 'REMOVE_LAYER_DEPENDENCIES', False)
if remove_layer_dependencies:
logger.info('Removing obsolete dependencies "%s" for layer %s' % (need_remove, layer_name))
@@ -43,7 +43,7 @@ from django.views.generic.edit import (CreateView, DeleteView, FormView,
from django_registration.backends.activation.views import RegistrationView
from reversion.models import Revision
-import settings
+from django.conf import settings
from layerindex.forms import (AdvancedRecipeSearchForm, BulkChangeEditFormSet,
ClassicRecipeForm, ClassicRecipeSearchForm,
ComparisonRecipeSelectForm, EditLayerForm,
@@ -6,7 +6,7 @@
#
# SPDX-License-Identifier: MIT
-import settings
+from django.conf import settings
from django.contrib.sites.models import Site
def rrs_context(request):
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
from django.db import migrations, models
-import settings
+from django.conf import settings
def populate_plan(apps, schema_editor):
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
from django.db import migrations, models
-import settings
+from django.conf import settings
def populate_layerbranch(apps, schema_editor):
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
from django.db import migrations, models
-import settings
+from django.conf import settings
def populate_rmh_layerbranch(apps, schema_editor):
@@ -47,7 +47,7 @@ def main():
loglevel = logging.INFO
utils.setup_django()
- import settings
+ from django.conf import settings
from rrs.models import MaintenancePlan, Release, Milestone, RecipeUpgrade, RecipeSymbol
import rrs.views
from django.db import transaction
@@ -30,7 +30,7 @@ logger = utils.logger_create('RrsExport')
def rrs_export(args):
utils.setup_django()
- import settings
+ from django.conf import settings
from rrs.models import RecipeUpstreamHistory, RecipeUpstream
class DatetimeEncoder(json.JSONEncoder):
@@ -68,7 +68,7 @@ def rrs_export(args):
def rrs_import(args):
utils.setup_django()
- import settings
+ from django.conf import settings
from django.db import transaction
from rrs.models import RecipeUpstreamHistory, RecipeUpstream
from layerindex.models import Recipe
@@ -121,7 +121,7 @@ def rrs_import(args):
def rrs_remove_duplicates(args):
utils.setup_django()
- import settings
+ from django.conf import settings
from django.db import transaction
from rrs.models import RecipeUpstreamHistory
from layerindex.models import Recipe
@@ -24,7 +24,7 @@ from layerindex import utils
utils.setup_django()
from django.db import transaction
from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-import settings
+from django.conf import settings
logger = get_logger("RecipeDistros", settings)
fetchdir = settings.LAYER_FETCH_DIR
@@ -21,7 +21,7 @@ from layerindex import utils, recipeparse
utils.setup_django()
from django.db import transaction
-import settings
+from django.conf import settings
from layerindex.models import Recipe, LayerBranch, LayerItem
from rrs.models import MaintenancePlan, Maintainer, RecipeSymbol, RecipeMaintainerHistory, RecipeMaintainer, RecipeMaintenanceLink
@@ -27,7 +27,7 @@ from layerindex import utils
import git
utils.setup_django()
-import settings
+from django.conf import settings
logger = get_logger("HistoryUpgrade", settings)
fetchdir = settings.LAYER_FETCH_DIR
@@ -27,7 +27,7 @@ from django.template.loader import get_template
from django.template import Context, Template
from django.urls import reverse
from django.contrib.sites.models import Site
-import settings
+from django.conf import settings
from layerindex.models import LayerItem, LayerBranch, Recipe
from rrs.models import Maintainer, RecipeMaintainerHistory, RecipeMaintainer, \
@@ -24,7 +24,7 @@ from layerindex import utils
utils.setup_django()
from django.db import transaction
from django.core.exceptions import ObjectDoesNotExist
-import settings
+from django.conf import settings
logger = get_logger("UpstreamHistory", settings)
fetchdir = settings.LAYER_FETCH_DIR
@@ -577,7 +577,7 @@ if __name__=="__main__":
try:
utils.setup_django()
from django.db import transaction
- import settings
+ from django.conf import settings
logger = get_logger("HistoryUpgrade", settings)
@@ -14,7 +14,7 @@ from layerindex.auth_views import CaptchaRegistrationView, CaptchaPasswordResetV
from django.contrib import admin
admin.autodiscover()
-import settings
+from django.conf import settings
urlpatterns = [
re_path(r'^layerindex/', include('layerindex.urls')),
Per Django documentation [1] it should use the following form: `from django.conf import settings` not: `import settings` In few files the settings are not even used, so the import is removed. Bugzilla issue: https://bugzilla.yoctoproject.org/show_bug.cgi?id=16331 [1] - https://docs.djangoproject.com/en/6.0/topics/settings/#using-settings-in-python-code Signed-off-by: Piotr Buliński <piotr@qbee.io> --- layerindex/auth_forms.py | 2 +- layerindex/auth_views.py | 2 +- layerindex/bulkchange.py | 2 +- layerindex/context_processors.py | 2 +- layerindex/forms.py | 2 +- layerindex/layerconfparse.py | 2 +- layerindex/middleware.py | 2 -- layerindex/recipedesc.py | 1 - layerindex/tasks.py | 4 ++-- layerindex/tools/fixup_duplicates.py | 1 - layerindex/tools/import_classic.py | 2 +- layerindex/tools/import_layer.py | 2 +- layerindex/tools/import_otherdistro.py | 6 +++--- layerindex/tools/import_project.py | 2 +- layerindex/tools/mark_yp_compatible_layers.py | 1 - layerindex/update.py | 2 +- layerindex/update_layer.py | 2 +- layerindex/utils.py | 2 +- layerindex/views.py | 2 +- rrs/context_processors.py | 2 +- rrs/migrations/0004_maint_plan_default.py | 2 +- rrs/migrations/0013_reup_layerbranch_populate.py | 2 +- rrs/migrations/0015_rmh_layerbranch_populate.py | 2 +- rrs/tools/dump_upgrades.py | 2 +- rrs/tools/historytool.py | 6 +++--- rrs/tools/rrs_distros.py | 2 +- rrs/tools/rrs_maintainer_history.py | 2 +- rrs/tools/rrs_upgrade_history.py | 2 +- rrs/tools/rrs_upstream_email.py | 2 +- rrs/tools/rrs_upstream_history.py | 2 +- rrs/tools/upgrade_history_internal.py | 2 +- urls.py | 2 +- 32 files changed, 33 insertions(+), 38 deletions(-)