|
1 |
| -import celery |
2 |
| -from celery.app.task import Task |
| 1 | +from celery import Task |
3 | 2 | from django.db import connection
|
4 | 3 |
|
5 | 4 | from tenant_schemas_celery.cache import SimpleCache
|
|
9 | 8 |
|
10 | 9 | class SharedTenantCache(SimpleCache):
|
11 | 10 | def __init__(self):
|
12 |
| - super(SharedTenantCache, self).__init__(storage=_shared_storage) |
| 11 | + super().__init__(storage=_shared_storage) |
13 | 12 |
|
14 | 13 |
|
15 | 14 | class TenantTask(Task):
|
@@ -37,7 +36,7 @@ def tenant_cache(cls):
|
37 | 36 |
|
38 | 37 | @classmethod
|
39 | 38 | def get_tenant_for_schema(cls, schema_name):
|
40 |
| - from .compat import get_tenant_model |
| 39 | + from tenant_schemas_celery.compat import get_tenant_model |
41 | 40 |
|
42 | 41 | missing = object()
|
43 | 42 | cache = cls.tenant_cache()
|
@@ -65,11 +64,5 @@ def _add_current_schema(self, kwds):
|
65 | 64 | kwds["_schema_name"] = kwds.get("_schema_name", connection.schema_name)
|
66 | 65 |
|
67 | 66 | def apply(self, args=None, kwargs=None, *arg, **kw):
|
68 |
| - if celery.VERSION[0] < 4: |
69 |
| - kwargs = kwargs or {} |
70 |
| - self._add_current_schema(kwargs) |
71 |
| - |
72 |
| - else: |
73 |
| - # Celery 4.0 introduced strong typing and the `headers` meta dict. |
74 |
| - self._update_headers(kw) |
75 |
| - return super(TenantTask, self).apply(args, kwargs, *arg, **kw) |
| 67 | + self._update_headers(kw) |
| 68 | + return super().apply(args, kwargs, *arg, **kw) |
0 commit comments