diff --git a/ietf/bin/email-sync-discrepancies b/ietf/bin/email-sync-discrepancies index ac9122c18..83d8fcf7a 100755 --- a/ietf/bin/email-sync-discrepancies +++ b/ietf/bin/email-sync-discrepancies @@ -6,10 +6,7 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from optparse import OptionParser diff --git a/ietf/bin/expire-ids b/ietf/bin/expire-ids index 74f432e1f..8b5634fc3 100755 --- a/ietf/bin/expire-ids +++ b/ietf/bin/expire-ids @@ -3,9 +3,8 @@ import datetime, os import syslog -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") + syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/expire-last-calls b/ietf/bin/expire-last-calls index 762bae812..be90e65d3 100755 --- a/ietf/bin/expire-last-calls +++ b/ietf/bin/expire-last-calls @@ -3,9 +3,7 @@ import datetime, os import syslog -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/expire-submissions b/ietf/bin/expire-submissions index 5801f721e..f9a2c7531 100644 --- a/ietf/bin/expire-submissions +++ b/ietf/bin/expire-submissions @@ -3,9 +3,8 @@ import datetime, os import syslog -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") + syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/generate-draft-aliases b/ietf/bin/generate-draft-aliases index 7776efff3..4ceb093bf 100755 --- a/ietf/bin/generate-draft-aliases +++ b/ietf/bin/generate-draft-aliases @@ -31,10 +31,8 @@ DRAFT_EMAIL_SUFFIX='@tools.ietf.org' import os, sys basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") -from ietf import settings -from django.core import management -management.setup_environ(settings) from ietf.doc.models import Document from ietf.group.utils import get_group_chairs_emails, get_group_ads_emails diff --git a/ietf/bin/generate-wg-aliases b/ietf/bin/generate-wg-aliases index c8f12719f..c486d2310 100755 --- a/ietf/bin/generate-wg-aliases +++ b/ietf/bin/generate-wg-aliases @@ -17,10 +17,8 @@ mail lists: -ads, and -chairs import os, sys basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") -from ietf import settings -from django.core import management -management.setup_environ(settings) from ietf.group.models import Group from ietf.group.utils import get_group_ads_emails, get_group_chairs_emails, get_area_ads_emails, get_area_chairs_emails diff --git a/ietf/bin/iana-changes-updates b/ietf/bin/iana-changes-updates index 67361f90f..055f7354c 100755 --- a/ietf/bin/iana-changes-updates +++ b/ietf/bin/iana-changes-updates @@ -6,12 +6,10 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +from django.conf import settings from optparse import OptionParser parser = OptionParser() diff --git a/ietf/bin/iana-protocols-updates b/ietf/bin/iana-protocols-updates index 57f9d38df..be6c1874a 100755 --- a/ietf/bin/iana-protocols-updates +++ b/ietf/bin/iana-protocols-updates @@ -8,12 +8,10 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +from django.conf import settings from ietf.sync.iana import * def chunks(l, n): diff --git a/ietf/bin/iana-review-email b/ietf/bin/iana-review-email index 3d8cdcb79..32d615408 100755 --- a/ietf/bin/iana-review-email +++ b/ietf/bin/iana-review-email @@ -6,10 +6,7 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/notify-expirations b/ietf/bin/notify-expirations index 484adff73..987db0661 100755 --- a/ietf/bin/notify-expirations +++ b/ietf/bin/notify-expirations @@ -1,10 +1,8 @@ #!/usr/bin/env python -import datetime +import datetime, os -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.doc.expire import get_soon_to_expire_drafts, send_expire_warning_for_draft diff --git a/ietf/bin/rfc-editor-index-updates b/ietf/bin/rfc-editor-index-updates index 4d389ded5..0519eae8d 100755 --- a/ietf/bin/rfc-editor-index-updates +++ b/ietf/bin/rfc-editor-index-updates @@ -8,12 +8,10 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +from django.conf import settings from optparse import OptionParser parser = OptionParser() diff --git a/ietf/bin/rfc-editor-queue-updates b/ietf/bin/rfc-editor-queue-updates index 4f1f52e41..ae0976d15 100755 --- a/ietf/bin/rfc-editor-queue-updates +++ b/ietf/bin/rfc-editor-queue-updates @@ -8,12 +8,10 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +from django.conf import settings from ietf.sync.rfceditor import * syslog.syslog("Updating RFC Editor queue states from %s" % settings.RFC_EDITOR_QUEUE_URL) diff --git a/ietf/bin/send-milestone-reminders b/ietf/bin/send-milestone-reminders index a23a7bcb9..bbd514dd0 100755 --- a/ietf/bin/send-milestone-reminders +++ b/ietf/bin/send-milestone-reminders @@ -7,9 +7,7 @@ import datetime, os import syslog -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_LOCAL0) diff --git a/ietf/bin/send-scheduled-mail b/ietf/bin/send-scheduled-mail index 882e8369c..04069789d 100755 --- a/ietf/bin/send-scheduled-mail +++ b/ietf/bin/send-scheduled-mail @@ -3,9 +3,8 @@ import datetime, os, sys import syslog -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") + syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/test-crawl b/ietf/bin/test-crawl index 3c71f01f7..289112cd2 100755 --- a/ietf/bin/test-crawl +++ b/ietf/bin/test-crawl @@ -6,10 +6,7 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") import django.test from django.conf import settings diff --git a/ietf/idindex/generate_all_id2_txt.py b/ietf/idindex/generate_all_id2_txt.py index f2ca9c229..5d63368b9 100644 --- a/ietf/idindex/generate_all_id2_txt.py +++ b/ietf/idindex/generate_all_id2_txt.py @@ -30,9 +30,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.idindex.index import all_id2_txt print all_id2_txt().encode('utf-8'), diff --git a/ietf/idindex/generate_all_id_txt.py b/ietf/idindex/generate_all_id_txt.py index 1f72bc428..1a4128f7a 100644 --- a/ietf/idindex/generate_all_id_txt.py +++ b/ietf/idindex/generate_all_id_txt.py @@ -30,9 +30,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.idindex.index import all_id_txt print all_id_txt().encode("utf-8"), diff --git a/ietf/idindex/generate_id_abstracts_txt.py b/ietf/idindex/generate_id_abstracts_txt.py index 9a35b8b21..91b5ca462 100644 --- a/ietf/idindex/generate_id_abstracts_txt.py +++ b/ietf/idindex/generate_id_abstracts_txt.py @@ -30,9 +30,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.idindex.index import id_index_txt print id_index_txt(with_abstracts=True).encode('utf-8'), diff --git a/ietf/idindex/generate_id_index_txt.py b/ietf/idindex/generate_id_index_txt.py index ad25d5f4c..a47903d7c 100644 --- a/ietf/idindex/generate_id_index_txt.py +++ b/ietf/idindex/generate_id_index_txt.py @@ -30,9 +30,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.idindex.index import id_index_txt print id_index_txt().encode('utf-8'), diff --git a/ietf/name/generate_fixtures.py b/ietf/name/generate_fixtures.py index 144f17475..a70afbe37 100644 --- a/ietf/name/generate_fixtures.py +++ b/ietf/name/generate_fixtures.py @@ -3,22 +3,18 @@ # boiler plate import os, sys -ietf_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../ietf')) - -sys.path.insert(0, ietf_path) - -from django.core.management import setup_environ -import settings -setup_environ(settings) +basedir = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../..')) +sys.path.insert(0, basedir) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") # script from django.core.serializers import serialize from django.db.models import Q -def output(name, qs): +def output(name, seq): try: f = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures/%s.json" % name), 'w') - f.write(serialize("json", qs, indent=1)) + f.write(serialize("json", seq, indent=1)) f.close() except: from django.db import connection diff --git a/ietf/patches/fill_in_references.py b/ietf/patches/fill_in_references.py index 93f5df745..7bf3e3e55 100644 --- a/ietf/patches/fill_in_references.py +++ b/ietf/patches/fill_in_references.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.doc.models import Document,DocAlias,RelatedDocument,NewRevisionDocEvent from ietf.name.models import DocRelationshipName diff --git a/ietf/secr/drafts/report_progress_report.py b/ietf/secr/drafts/report_progress_report.py index c9a4335e0..a93a69fd9 100644 --- a/ietf/secr/drafts/report_progress_report.py +++ b/ietf/secr/drafts/report_progress_report.py @@ -1,6 +1,6 @@ -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.secr.drafts.views import report_progress_report import sys diff --git a/ietf/secr/groups/update_text_charters.py b/ietf/secr/groups/update_text_charters.py index e21997026..56026ff6b 100644 --- a/ietf/secr/groups/update_text_charters.py +++ b/ietf/secr/groups/update_text_charters.py @@ -1,6 +1,6 @@ -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.group.models import * @@ -12,4 +12,4 @@ def output_charter(group): return report group = Group.objects.get(acronym='alto') -output_charter(group) \ No newline at end of file +output_charter(group) diff --git a/ietf/secr/proceedings/report_progress_report.py b/ietf/secr/proceedings/report_progress_report.py index a482682a1..3d3b3fddc 100644 --- a/ietf/secr/proceedings/report_progress_report.py +++ b/ietf/secr/proceedings/report_progress_report.py @@ -1,8 +1,8 @@ # Use this script to generate the proceedings progress report without headers -from ietf import settings -from django.core import management -management.setup_environ(settings) +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.secr.proceedings.proc_utils import gen_progress from ietf.meeting.models import Meeting diff --git a/ietf/wgcharter/migrate.py b/ietf/wgcharter/migrate.py index 32121bd9e..5faffdb39 100644 --- a/ietf/wgcharter/migrate.py +++ b/ietf/wgcharter/migrate.py @@ -2,10 +2,7 @@ import sys, os, re, datetime basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path - -from ietf import settings -from django.core import management -management.setup_environ(settings) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") from ietf.doc.models import *