fix: catch TypeError in common settings

Author: jignaciopm

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v10.0.0](https://github.com/eduNEXT/eox-theming/compare/v9.3.1...v10.0.0) - (2026-02-11)
+
+#### ⚠ BREAKING CHANGES
+
+- **Dropped Support for Django 4.2**: Removed support for Django 4.2 in this plugin. As a result, we have also dropped support for Open edX releases from Palm up to and including Teak, which rely on Django 4.2. Future versions of this plugin may not be compatible with these Open edX releases.
+
 ## [v9.3.1](https://github.com/eduNEXT/eox-theming/compare/v9.3.0...v9.3.1) - (2026-01-20)
 
 ### Changed

Makefile

@@ -56,6 +56,6 @@ quality: clean ## check coding style with pycodestyle and pylint
 test-python: clean ## Run test suite.
 	$(TOX) pip install -r requirements/test.txt --exists-action w
 	$(TOX) coverage run --source="." -m pytest ./eox_theming --ignore-glob='**/integration/*'
-	$(TOX) coverage report -m --fail-under=74
+	$(TOX) coverage report -m --fail-under=73
 
 run-tests: test-python quality

README.rst

@@ -48,7 +48,7 @@ Compatibility Notes
 +------------------+---------------+
 | Teak             | >= 9.0.0      |
 +------------------+---------------+
-| Ulmo             | >= 9.3.1      |
+| Ulmo             | >= 10.0.0     |
 +------------------+---------------+
 
 The plugin is configured for the latest release (Teak). If you need compatibility for previous releases, go to the README of the relevant version tag and if it is necessary you can change the configuration in ``eox_theming/settings/common.py``.

eox_theming/__init__.py

@@ -4,4 +4,4 @@
 
 from __future__ import unicode_literals
 
-__version__ = '9.3.1'
+__version__ = '10.0.0'

eox_theming/settings/common.py

@@ -10,6 +10,10 @@
 
 from __future__ import unicode_literals
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
 
@@ -50,9 +54,8 @@ def plugin_settings(settings):
 
     try:
         settings.TEMPLATES[0]['OPTIONS']['loaders'][0] = 'eox_theming.theming.template_loaders.EoxThemeTemplateLoader'
-    except AttributeError:
-        # We must find a way to register this error
-        pass
+    except (AttributeError, TypeError):
+        logger.error("Couldn't set template loaders. Check your settings.")
 
     try:
         eox_configuration_path = 'eox_theming.theming.context_processor.eox_configuration'
@@ -62,18 +65,24 @@ def plugin_settings(settings):
             settings.TEMPLATES[1]['OPTIONS']['context_processors'].append(eox_configuration_path)
 
         settings.DEFAULT_TEMPLATE_ENGINE = settings.TEMPLATES[0]
-    except AttributeError:
-        # We must find a way to register this error
-        pass
+    except (AttributeError, TypeError):
+        logger.error("Couldn't set default template engine. Check your settings.")
 
     try:
         settings.MIDDLEWARE = [
             'eox_theming.theming.middleware.EoxThemeMiddleware' if 'CurrentSiteThemeMiddleware' in x else x
             for x in settings.MIDDLEWARE
         ]
-    except AttributeError:
-        # We must find a way to register this error.
-        pass
+    except (AttributeError, TypeError):
+        logger.error("Couldn't set MIDDLEWARE. Check your settings.")
+
+    if hasattr(settings, 'STORAGES'):
+        new_storages = dict(settings.STORAGES)
+        if 'staticfiles' in new_storages:
+            static_cfg = dict(new_storages['staticfiles'])
+            static_cfg['BACKEND'] = 'eox_theming.theming.storage.EoxProductionStorage'
+            new_storages['staticfiles'] = static_cfg
+            settings.STORAGES = new_storages
 
     settings.EOX_THEMING_DEFAULT_THEME_NAME = 'bragi'
 
@@ -93,10 +102,4 @@ def plugin_settings(settings):
     settings.EOX_THEMING_CONFIGURATION_HELPER_BACKEND = 'eox_theming.edxapp_wrapper.backends.j_configuration_helpers'
     settings.EOX_THEMING_THEMING_HELPER_BACKEND = 'eox_theming.edxapp_wrapper.backends.j_theming_helpers'
     settings.EOX_THEMING_STORAGE_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_storage'
-
-    if not hasattr(settings, 'STORAGES'):
-        settings.STORAGES = {}
-
-    settings.STORAGES.setdefault('staticfiles', {})['BACKEND'] = 'eox_theming.theming.storage.EoxProductionStorage'
-
     settings.EOX_THEMING_EDXMAKO_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_mako'

eox_theming/settings/devstack.py

@@ -14,7 +14,10 @@ def plugin_settings(settings):
         'eox_theming.theming.finders.EoxThemeFilesFinder',
     ] + settings.STATICFILES_FINDERS
 
-    if not hasattr(settings, 'STORAGES'):
-        settings.STORAGES = {}
-
-    settings.STORAGES.setdefault('staticfiles', {})['BACKEND'] = 'eox_theming.theming.storage.EoxDevelopmentStorage'
+    if hasattr(settings, 'STORAGES'):
+        new_storages = dict(settings.STORAGES)
+        if 'staticfiles' in new_storages:
+            static_cfg = dict(new_storages['staticfiles'])
+            static_cfg['BACKEND'] = 'eox_theming.theming.storage.EoxDevelopmentStorage'
+            new_storages['staticfiles'] = static_cfg
+            settings.STORAGES = new_storages

eox_theming/settings/test.py

@@ -5,12 +5,15 @@
 from __future__ import unicode_literals
 
 import codecs
+import logging
 import os
 
 import yaml
 
 from .common import *  # pylint: disable=wildcard-import
 
+logger = logging.getLogger(__name__)
+
 
 class SettingsClass:
     """ dummy settings class """
@@ -60,12 +63,15 @@ def plugin_settings(settings):  # pylint: disable=function-redefined
             for x in settings.MIDDLEWARE
         ]
     except AttributeError:
-        pass
-
-    if not hasattr(settings, 'STORAGES'):
-        settings.STORAGES = {}
-
-    settings.STORAGES.setdefault('staticfiles', {})['BACKEND'] = 'eox_theming.theming.storage.EoxProductionStorage'
+        logger.error("Couldn't set MIDDLEWARE. Check your settings.")
+
+    if hasattr(settings, 'STORAGES'):
+        new_storages = dict(settings.STORAGES)
+        if 'staticfiles' in new_storages:
+            static_cfg = dict(new_storages['staticfiles'])
+            static_cfg['BACKEND'] = 'openedx.core.storage.ProductionStorage'
+            new_storages['staticfiles'] = static_cfg
+            settings.STORAGES = new_storages
 
     settings.STATICFILES_FINDERS = [
         x for x in settings.STATICFILES_FINDERS if 'EoxThemeFilesFinder' not in x

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 9.3.1
+current_version = 10.0.0
 commit = False
 tag = False