From ab8f2d9fad38ab5cda82f50d41b417e73633dcac Mon Sep 17 00:00:00 2001 From: qifeng Date: Thu, 20 Jan 2022 12:46:36 +0800 Subject: [PATCH] fix: --- django_celery_beat/schedulers.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/django_celery_beat/schedulers.py b/django_celery_beat/schedulers.py index 9a09ea02..a870b6dc 100644 --- a/django_celery_beat/schedulers.py +++ b/django_celery_beat/schedulers.py @@ -15,16 +15,7 @@ from kombu.utils.json import dumps, loads from django.conf import settings -<<<<<<< HEAD -from django.db import ( - DEFAULT_DB_ALIAS, - close_old_connections, - router, - transaction -) -======= from django.db import transaction, close_old_connections, router, DEFAULT_DB_ALIAS ->>>>>>> dbb0cde78b3b0bdcd444405cc4ac68ccf8835076 from django.db.utils import DatabaseError, InterfaceError from django.core.exceptions import ObjectDoesNotExist @@ -304,7 +295,7 @@ def target_db(self): # If the project does not actually implement this method, # DEFAULT_DB_ALIAS will be automatically returned. # The exception will be located to the django routing section - db = router.db_for_write(self.Model + db = router.db_for_write(self.Model) return db def _sync(self):