New way for django standalone scripts

diff --git a/tools/commitfest/check_patches_in_archives.py b/tools/commitfest/check_patches_in_archives.py
index 60314db674ba16efb72eb95debac737448e496cc..2658346a4b6f2e9f3864f1f8cac2b11bde7eeef0 100755 (executable)
--- a/tools/commitfest/check_patches_in_archives.py
+++ b/tools/commitfest/check_patches_in_archives.py
@@ -15,12 +15,13 @@ import magic
 import logging
 
 # Set up for accessing django
-from django.core.management import setup_environ
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../../pgcommitfest'))
-import settings
-setup_environ(settings)
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../../'))
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
+import django
+django.setup()
 
 from django.db import connection
+from django.conf import settings
 
 from commitfest.models import MailThreadAttachment
 

diff --git a/tools/commitfest/update_archive_threads.py b/tools/commitfest/update_archive_threads.py
index d48f21563ee740cf7b61424d372242ebad26c5b7..707e545c7b56d33cb4d1ae52de5456b0cbd4ce20 100755 (executable)
--- a/tools/commitfest/update_archive_threads.py
+++ b/tools/commitfest/update_archive_threads.py
@@ -11,10 +11,10 @@ import sys
 import logging
 
 # Set up for accessing django
-from django.core.management import setup_environ
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../../pgcommitfest'))
-import settings
-setup_environ(settings)
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../../'))
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
+import django
+django.setup()
 
 from django.db import connection
 

diff --git a/tools/mail/send_queued_mail.py b/tools/mail/send_queued_mail.py
index 5a8005f782c6c5523a312420e4c28f4decd12b32..84f240d7ddec13e76e24e6c1ed715606caf18cf6 100755 (executable)
--- a/tools/mail/send_queued_mail.py
+++ b/tools/mail/send_queued_mail.py
@@ -13,10 +13,10 @@ import os
 import smtplib
 
 # Set up to run in django environment
-from django.core.management import setup_environ
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../../pgcommitfest'))
-import settings
-setup_environ(settings)
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '../../'))
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
+import django
+django.setup()
 
 from django.db import connection, transaction