WIP: django-3.2-compat #3

Draft
slamora wants to merge 8 commits from django-3.2-compat into main
1 changed files with 7 additions and 7 deletions
Showing only changes of commit 76c18c0cae - Show all commits

View File

@ -1,14 +1,14 @@
import sys import sys
from contextlib import ContextDecorator
from threading import local from threading import local
from django.contrib.admin.models import LogEntry from django.contrib.admin.models import LogEntry
from django.db.models.signals import pre_delete, post_save, m2m_changed from django.db.models.signals import m2m_changed, post_save, pre_delete
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.decorators import ContextDecorator
from orchestra.utils.python import OrderedSet from orchestra.utils.python import OrderedSet
from . import manager, Operation, helpers from . import Operation, helpers, manager
from .middlewares import OperationsMiddleware from .middlewares import OperationsMiddleware
from .models import BackendLog, BackendOperation from .models import BackendLog, BackendOperation
@ -37,7 +37,7 @@ def m2m_collector(sender, *args, **kwargs):
class orchestrate(ContextDecorator): class orchestrate(ContextDecorator):
""" """
Context manager for triggering backend operations out of request-response cycle, e.g. shell Context manager for triggering backend operations out of request-response cycle, e.g. shell
with orchestrate(): with orchestrate():
user = SystemUser.objects.get(username='rata') user = SystemUser.objects.get(username='rata')
user.shell = '/dev/null' user.shell = '/dev/null'
@ -46,7 +46,7 @@ class orchestrate(ContextDecorator):
thread_locals = local() thread_locals = local()
thread_locals.pending_operations = None thread_locals.pending_operations = None
thread_locals.route_cache = None thread_locals.route_cache = None
@classmethod @classmethod
def collect(cls, action, **kwargs): def collect(cls, action, **kwargs):
""" Collects all pending operations derived from model signals """ """ Collects all pending operations derived from model signals """
@ -57,14 +57,14 @@ class orchestrate(ContextDecorator):
kwargs['route_cache'] = cls.thread_locals.route_cache kwargs['route_cache'] = cls.thread_locals.route_cache
instance = kwargs.pop('instance') instance = kwargs.pop('instance')
manager.collect(instance, action, **kwargs) manager.collect(instance, action, **kwargs)
def __enter__(self): def __enter__(self):
cls = type(self) cls = type(self)
self.old_pending_operations = cls.thread_locals.pending_operations self.old_pending_operations = cls.thread_locals.pending_operations
cls.thread_locals.pending_operations = OrderedSet() cls.thread_locals.pending_operations = OrderedSet()
self.old_route_cache = cls.thread_locals.route_cache self.old_route_cache = cls.thread_locals.route_cache
cls.thread_locals.route_cache = {} cls.thread_locals.route_cache = {}
def __exit__(self, exc_type, exc_value, traceback): def __exit__(self, exc_type, exc_value, traceback):
cls = type(self) cls = type(self)
if not exc_type: if not exc_type: