educommon 3.9.2__tar.gz → 3.9.4__tar.gz

{educommon-3.9.2/src/educommon.egg-info → educommon-3.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.9.2
+Version: 3.9.4
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -17,7 +17,8 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
-Requires-Dist: Django<3.1,>=2.2
+Requires-Dist: packaging<24,>=21.3
+Requires-Dist: Django<3.2,>=2.2
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor

{educommon-3.9.2 → educommon-3.9.4}/setup.py

@@ -46,7 +46,8 @@ def main():
             'm3-builder>=1.2,<2',
         ),
         install_requires=(
-            'Django>=2.2,<3.1',
+            'packaging>=21.3,<24',
+            'Django>=2.2,<3.2',
             'django-mptt',
             'python-dateutil',
             'termcolor',

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/audit_log/proxies.py

@@ -24,8 +24,9 @@ from django.utils.dateparse import (
     parse_time,
 )
 from django.utils.encoding import (
-    force_text,
+    force_str,
 )
+
 from m3_django_compat import (
     get_related,
 )
@@ -78,7 +79,7 @@ class LogProxy(AuditLog):
         if model:
             verbose = model._meta.verbose_name
             if verbose:
-                return ' - '.join((force_text(verbose), model.__name__))
+                return ' - '.join((force_str(verbose), model.__name__))
             return model.__name__
         return self.table.name
 
@@ -130,7 +131,7 @@ class LogProxy(AuditLog):
         if self.fields:
             field = self.fields.get(column_name)
             if field and field.verbose_name:
-                name = force_text(field.verbose_name)
+                name = force_str(field.verbose_name)
         return name
 
     def convert_field_value(self, column_name, value):
@@ -169,7 +170,7 @@ class LogProxy(AuditLog):
                         value = get_choice(field.choices, value)
                 except (ValueError, TypeError):
                     pass
-        return force_text(value)
+        return force_str(value)
 
     @property
     def object_string(self):

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/auth/rbac/models.py

@@ -5,14 +5,12 @@ from django.contrib.contenttypes.models import (
 )
 from django.core.exceptions import (
     NON_FIELD_ERRORS,
+    FieldDoesNotExist,
     ValidationError,
 )
 from django.db import (
     models,
 )
-from django.db.models.fields import (
-    FieldDoesNotExist,
-)
 from django.db.models.signals import (
     post_delete,
     pre_delete,
@@ -20,6 +18,7 @@ from django.db.models.signals import (
 from django.dispatch import (
     receiver,
 )
+
 from m3 import (
     ApplicationLogicException,
 )

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/auth/simple_auth/app_meta.py

@@ -1,6 +1,7 @@
-from django.conf.urls import (
-    url,
+from django.urls import (
+    re_path,
 )
+
 from m3.actions import (
     ControllerCache,
 )
@@ -9,7 +10,6 @@ from m3_ext.ui.app_ui import (
     DesktopLoader,
     DesktopShortcut,
 )
-
 from objectpack.desktop import (
     uificate_the_controller,
 )
@@ -51,5 +51,5 @@ def register_desktop_menu():
 def register_urlpatterns():
     """Регистрация URL контроллера."""
     return [
-        url(*auth_controller.urlpattern),
+        re_path(*auth_controller.urlpattern),
     ]

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/db/mixins/validation.py

@@ -107,7 +107,7 @@ class Manager(DjangoManager):
         return QuerySet(self.model, using=self._db)
 
 
-pre_clean = Signal(providing_args=('errors',))
+pre_clean = Signal()
 """Сигнал, отправляемый перед валидацией модели.
 
 :param defaultdict errors: Словарь, содержащий ошибки валидации экземпляра
@@ -119,7 +119,7 @@ pre_clean = Signal(providing_args=('errors',))
 """
 
 
-post_clean = Signal(providing_args=('errors',))
+post_clean = Signal()
 """Сигнал, отправляемый после валидации модели.
 
 :param defaultdict errors: Словарь, содержащий ошибки валидации экземпляра

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/db/model_view/__init__.py

@@ -16,8 +16,9 @@ from django.template.loader import (
     render_to_string,
 )
 from django.utils.encoding import (
-    force_text,
+    force_str,
 )
+
 from m3_django_compat import (
     get_model,
 )
@@ -132,7 +133,7 @@ class JoinedAttrValues(DataExtractor):
         values = []
         for field_name in self._field_names:
             try:
-                value = force_text(get_nested_attr(obj, field_name) or '')
+                value = force_str(get_nested_attr(obj, field_name) or '')
             except AttributeError:
                 return ''
             else:
@@ -154,7 +155,7 @@ class FieldChoiceValue(DataExtractor):
         except AttributeError:
             return ''
         else:
-            return force_text(
+            return force_str(
                 dict(field.flatchoices).get(value, value),
                 strings_only=True
             )

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/db/partitioning/__init__.py

@@ -227,7 +227,7 @@ def set_partitioning_for_model(model, column_name, force=False):
         значение будет определять раздел таблицы, в который будет помещена
         запись.
 
-    :raises django.db.models.fields.FieldDoesNotExist: если модель *model* не
+    :raises django.core.exceptions.FieldDoesNotExist: если модель *model* не
         содержит поля *column_name*
     """
     database_alias, table_name, pk_column_name = _get_model_params(model)
@@ -258,7 +258,7 @@ def split_table(model, column_name, timeout=0):
     :param float timeout: Время ожидания в секундах  между переносом записей
         (можно использовать для снижения нагрузки на СУБД).
 
-    :raises django.db.models.fields.FieldDoesNotExist: если модель *model* не
+    :raises django.core.exceptions.FieldDoesNotExist: если модель *model* не
         содержит поля *column_name*
     """
     database_alias, table_name, pk_column_name = _get_model_params(model)

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/db/partitioning/management/commands/clear_table.py

@@ -1,9 +1,10 @@
+from django.core.exceptions import (
+    FieldDoesNotExist,
+)
 from django.core.management.base import (
     CommandError,
 )
-from django.db.models.fields import (
-    FieldDoesNotExist,
-)
+
 from m3_django_compat import (
     BaseCommand,
     get_model,

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/db/partitioning/management/commands/split_table.py

@@ -1,9 +1,10 @@
+from django.core.exceptions import (
+    FieldDoesNotExist,
+)
 from django.core.management.base import (
     CommandError,
 )
-from django.db.models.fields import (
-    FieldDoesNotExist,
-)
+
 from m3_django_compat import (
     BaseCommand,
     get_model,

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/db/utils.py

@@ -9,13 +9,18 @@ from weakref import (
     WeakKeyDictionary,
 )
 
-import django
 from django.core.validators import (
     MaxLengthValidator,
 )
 from django.db.models.base import (
     ModelBase,
 )
+from django.db.models.expressions import (
+    Func,
+)
+from django.db.models.lookups import (
+    Lookup,
+)
 from django.db.models.signals import (
     post_delete,
     post_save,
@@ -23,6 +28,7 @@ from django.db.models.signals import (
 from django.dispatch.dispatcher import (
     receiver,
 )
+
 from m3_django_compat import (
     ModelOptions,
     atomic,
@@ -203,65 +209,58 @@ class LazyModel:
         return self._model
 
 
-if django.VERSION >= (1, 8):
-    from django.db.models.expressions import (
-        Func,
-    )
-    from django.db.models.lookups import (
-        Lookup,
-    )
+class SmartExact(Func):
+    """Удаляет пробелы из строки и заменяет буквы ё на е."""
 
-    class SmartExact(Func):
-        """Удаляет пробелы из строки и заменяет буквы ё на е."""
+    template = "TRANSLATE(%(expressions)s, 'ёЁ ', 'еЕ')"
 
-        template = "TRANSLATE(%(expressions)s, 'ёЁ ', 'еЕ')"
+class SmartExactLookup(Lookup):
+    """Удаляет пробелы из строки и заменяет буквы ё на е."""
 
-    class SmartExactLookup(Lookup):
-        """Удаляет пробелы из строки и заменяет буквы ё на е."""
+    lookup_name = 'smart_exact'
 
-        lookup_name = 'smart_exact'
+    def as_postgresql(self, compiler, connection):
+        lhs, lhs_params = self.process_lhs(compiler, connection)
+        rhs, rhs_params = self.process_rhs(compiler, connection)
 
-        def as_postgresql(self, compiler, connection):
-            lhs, lhs_params = self.process_lhs(compiler, connection)
-            rhs, rhs_params = self.process_rhs(compiler, connection)
+        sql = "TRANSLATE(%s, 'ёЁ ', 'еЕ')"
+        sql = '{sql} = {sql}'.format(sql=sql)
 
-            sql = "TRANSLATE(%s, 'ёЁ ', 'еЕ')"
-            sql = '{sql} = {sql}'.format(sql=sql)
+        return sql % (lhs, rhs), lhs_params + rhs_params
 
-            return sql % (lhs, rhs), lhs_params + rhs_params
+class SmartIExact(Func):
+    """Переводит в верхний регистр, удаляет пробелы, заменяет Ё на Е."""
 
-    class SmartIExact(Func):
-        """Переводит в верхний регистр, удаляет пробелы, заменяет Ё на Е."""
+    template = "TRANSLATE(UPPER(%(expressions)s), 'Ё ', 'Е')"
 
-        template = "TRANSLATE(UPPER(%(expressions)s), 'Ё ', 'Е')"
+class SmartIExactLookup(Lookup):
+    """Переводит в верхний регистр, удаляет пробелы, заменяет Ё на Е."""
 
-    class SmartIExactLookup(Lookup):
-        """Переводит в верхний регистр, удаляет пробелы, заменяет Ё на Е."""
+    lookup_name = 'smart_iexact'
 
-        lookup_name = 'smart_iexact'
+    def as_postgresql(self, compiler, connection):
+        lhs, lhs_params = self.process_lhs(compiler, connection)
+        rhs, rhs_params = self.process_rhs(compiler, connection)
 
-        def as_postgresql(self, compiler, connection):
-            lhs, lhs_params = self.process_lhs(compiler, connection)
-            rhs, rhs_params = self.process_rhs(compiler, connection)
+        sql = "TRANSLATE(UPPER(%s), 'Ё ', 'Е')"
+        sql = '{sql} = {sql}'.format(sql=sql)
 
-            sql = "TRANSLATE(UPPER(%s), 'Ё ', 'Е')"
-            sql = '{sql} = {sql}'.format(sql=sql)
+        return sql % (lhs, rhs), lhs_params + rhs_params
 
-            return sql % (lhs, rhs), lhs_params + rhs_params
+class SmartIContainsLookup(Lookup):
+    """Регистронезависимый поиск.
 
-    class SmartIContainsLookup(Lookup):
-        """
-        Переводит в верхний регистр, удаляет пробелы, заменяет Ё на Е,
-        проверяет вхождение текста.
-        """
+    Переводит в верхний регистр, удаляет пробелы, заменяет Ё на Е, проверяет
+    вхождение текста.
+    """
 
-        lookup_name = 'smart_icontains'
+    lookup_name = 'smart_icontains'
 
-        def as_postgresql(self, compiler, connection):
-            lhs, lhs_params = self.process_lhs(compiler, connection)
-            rhs, rhs_params = self.process_rhs(compiler, connection)
+    def as_postgresql(self, compiler, connection):
+        lhs, lhs_params = self.process_lhs(compiler, connection)
+        rhs, rhs_params = self.process_rhs(compiler, connection)
 
-            sql = "TRANSLATE(UPPER(%s), 'Ё ', 'Е')"
-            sql = "{sql} like '%%%%' || {sql} || '%%%%'".format(sql=sql)
+        sql = "TRANSLATE(UPPER(%s), 'Ё ', 'Е')"
+        sql = "{sql} like '%%%%' || {sql} || '%%%%'".format(sql=sql)
 
-            return sql % (lhs, rhs), lhs_params + rhs_params
+        return sql % (lhs, rhs), lhs_params + rhs_params

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/django/storages/atcfs/app_meta.py

@@ -1,5 +1,5 @@
-from django.conf.urls import (
-    url,
+from django.urls import (
+    re_path,
 )
 from django.views.generic import (
     TemplateView,
@@ -8,7 +8,7 @@ from django.views.generic import (
 
 def register_urlpatterns():
     urlpatterns = [
-        url(
+        re_path(
             r'^atcfs_unavailable/$',
             TemplateView.as_view(template_name='atcfs_unavailable.html'),
             name='atcfs_unavailable'

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/logger/loggers.py

@@ -11,7 +11,7 @@ from typing import (
 )
 
 from django.utils.encoding import (
-    smart_text,
+    smart_str,
 )
 from packaging.version import (
     Version,
@@ -101,7 +101,7 @@ class WebEduLogger(getLoggerClass()):
                 exc_info = sys.exc_info()
 
         session_info = get_session_info(request)
-        msg = f'{session_info}{smart_text(msg)}'
+        msg = f'{session_info}{smart_str(msg)}'
 
         record = self.makeRecord(self.name, level, fn, lno, msg, args, exc_info, func, extra, sinfo)
         self.handle(record)

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/m3/__init__.py

@@ -17,14 +17,14 @@ from django.db.transaction import (
     atomic,
 )
 from django.utils.encoding import (
-    force_text,
+    force_str,
 )
+
 from m3.actions import (
     Action,
     ActionPack,
     ControllerCache,
 )
-
 from objectpack.exceptions import (
     ValidationError as ObjectPackValidationError,
 )
@@ -179,7 +179,7 @@ class ModelProxyValidationMixin:
                     # объект будет создан при сохранении составной
                     # модели.
                     field = self._meta.get_field(full_field_name)
-                    if force_text(field.error_messages['null']) in messages:
+                    if force_str(field.error_messages['null']) in messages:
                         messages.remove(field.error_messages['null'])
                     if not messages:
                         continue

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/m3/extensions/listeners/delete_check/listeners.py

@@ -50,9 +50,7 @@ class DeleteCheck:
     #: :param related_objects: Словарь, сопоставляющий удаляемые
     #:     и зависимые объекты.
     #: :type related_objects: collections.defaultdict
-    collect_implicit = Signal(
-        providing_args=['objects_to_delete', 'related_objects']
-    )
+    collect_implicit = Signal()
 
     def _get_message(self, objects):
         """Возвращает сообщение в правильном склонении."""

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/report/constructor/base.py

@@ -17,8 +17,9 @@ from django.db.models.fields.reverse_related import (
     OneToOneRel,
 )
 from django.utils.encoding import (
-    force_text,
+    force_str,
 )
+
 from m3_django_compat import (
     ModelOptions,
     get_related,
@@ -230,6 +231,11 @@ class ColumnDescriptor:
             )
             if skip_field(descriptor.parent.model, field, accessor_name):
                 return True
+            # проверка, что связанная модель поля, не связана с родительскими моделями полей
+            if (getattr(field, 'related_model', None) and
+                field.related_model in descriptor.parent.related_field_models
+            ):
+                return True
 
             descriptor = descriptor.parent
         # проверка модели источника данных
@@ -250,13 +256,32 @@ class ColumnDescriptor:
 
         return model
 
+    @cached_property
+    def related_field_models(self):
+        """Связанные модели полей."""
+        fields_models = set()
+        # Для первых в корне добавляем модели источника данных.
+        if self.parent is None:
+            data_source_columns = tuple(self.data_source.get_available_columns())
+            fields_models.update({column.model for column in data_source_columns if column.model})
+            fields_models.add(self.data_source.model)
+
+        # получаем поля текущего экземпляра
+        if self.model:
+            fields = self.model._meta.get_fields()
+            fields_models.update({field.related_model for field in fields if field.related_model})
+            # добавляем саму модель экземпляра, если она есть
+            fields_models.add(self.model)
+
+        return fields_models
+
     @property
     def accessor_name(self):
-        return force_text(_get_accessor_name(self.field))
+        return force_str(_get_accessor_name(self.field))
 
     @property
     def lookup(self):
-        return force_text(self.field.name)
+        return force_str(self.field.name)
 
     @property
     def full_accessor_name(self):
@@ -311,7 +336,7 @@ class ColumnDescriptor:
         else:
             result = self.field.verbose_name
 
-        return force_text(result)
+        return force_str(result)
 
     def get_full_title(self, delimiter=' → '):
         """Возвращает полное наименование с учетом иерархии.
@@ -521,13 +546,13 @@ class _ModelDataSourceInfo:
         """Внутрисистемное имя источника данных."""
         result = '.'.join((self._model.app_label, self._model.model_name))
 
-        return force_text(result)
+        return force_str(result)
 
     @cached_property
     def title(self):
         """Отображаемое пользователю наименование источника данных."""
         result = getattr(self.model, '_meta').verbose_name
-        return force_text(result)
+        return force_str(result)
 
 
 class ModelDataSourceParams(_ModelDataSourceInfo):

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/report/constructor/builders/excel/_base.py

@@ -32,15 +32,16 @@ from django.forms.fields import (
     BooleanField,
 )
 from django.utils.encoding import (
-    force_text,
-)
-from m3.actions.exceptions import (
-    ApplicationLogicException,
+    force_str,
 )
 from xlsxwriter import (
     Workbook,
 )
 
+from m3.actions.exceptions import (
+    ApplicationLogicException,
+)
+
 from educommon.report.constructor import (
     constants,
 )
@@ -898,7 +899,7 @@ class DataLoader:
     def _get_field_display(field, field_value):
         for value, name in field.flatchoices:
             if value == field_value:
-                return force_text(name, strings_only=True)
+                return force_str(name, strings_only=True)
 
     @staticmethod
     def _get_object_data(obj, attr_name, nested):

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/secure_media/app_meta.py

@@ -6,18 +6,19 @@ from django import (
 from django.conf import (
     settings,
 )
-from django.conf.urls import (
-    url,
+from django.urls import (
+    re_path,
 )
+from sendfile import (
+    sendfile,
+)
+
 from m3 import (
     M3JSONEncoder,
 )
 from m3_django_compat import (
     is_authenticated,
 )
-from sendfile import (
-    sendfile,
-)
 
 
 def check_autorization(request, path):
@@ -40,5 +41,5 @@ def check_autorization(request, path):
 
 
 urlpatterns = [
-    url(r'^media/(?P<path>.*)$', check_autorization)
+    re_path(r'^media/(?P<path>.*)$', check_autorization)
 ]

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/utils/system_app/management/commands/delete_objects.py

@@ -24,7 +24,7 @@ from django.db import (
     connections,
 )
 from django.utils.encoding import (
-    force_text,
+    force_str,
 )
 
 
@@ -70,7 +70,7 @@ def call_custom_command(command_name, *args, **options):
             parser.add_argument(com, action='store')
         else:
             parser.add_argument(com)
-    defaults = parser.parse_args(args=[force_text(a) for a in args])
+    defaults = parser.parse_args(args=[force_str(a) for a in args])
     defaults = dict(defaults._get_kwargs(), **arg_options)
     # Move positional args out of options to mimic legacy optparse
     args = defaults.pop('args', ())

{educommon-3.9.2 → educommon-3.9.4}/src/educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.2^0
-VERSION = 3.9.2
-REVISION = da80b4e265b466aafffa36b94db108b4b01fae9f
-VERSION_DATE = 06.03.2024
-REVISION_DATE = 06.03.2024
+BRANCH = tags/3.9.4^0
+VERSION = 3.9.4
+REVISION = b525751553abee2f4deac7b1783499fb00ef29f5
+VERSION_DATE = 03.04.2024
+REVISION_DATE = 03.04.2024

{educommon-3.9.2 → educommon-3.9.4/src/educommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.9.2
+Version: 3.9.4
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -17,7 +17,8 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Framework :: Django :: 2.2
 Classifier: Framework :: Django :: 3.0
-Requires-Dist: Django<3.1,>=2.2
+Requires-Dist: packaging<24,>=21.3
+Requires-Dist: Django<3.2,>=2.2
 Requires-Dist: django-mptt
 Requires-Dist: python-dateutil
 Requires-Dist: termcolor

{educommon-3.9.2 → educommon-3.9.4}/src/educommon.egg-info/requires.txt

@@ -1,4 +1,5 @@
-Django<3.1,>=2.2
+packaging<24,>=21.3
+Django<3.2,>=2.2
 django-mptt
 python-dateutil
 termcolor