From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 6 Jan 2016 16:35:23 +0000 (+0100)
Subject: New way for django standalone scripts
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=8010e5acbb1e03c0ebd899a3cf043b4ce9d5cfd6;p=pgcommitfest2.git

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 60314db..2658346 100755
--- 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 d48f215..707e545 100755
--- 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 5a8005f..84f240d 100755
--- 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