diff --git a/ietf/bin/2016-05-25-collect-photos b/ietf/bin/2016-05-25-collect-photos index 8348a398c..27014e08d 100755 --- a/ietf/bin/2016-05-25-collect-photos +++ b/ietf/bin/2016-05-25-collect-photos @@ -5,9 +5,13 @@ from collections import namedtuple from PIL import Image # boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../")) +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/announce-header-change b/ietf/bin/announce-header-change index 45ae3b73a..0561d0d51 100755 --- a/ietf/bin/announce-header-change +++ b/ietf/bin/announce-header-change @@ -6,7 +6,11 @@ import datetime # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/create-break-sessions b/ietf/bin/create-break-sessions index 842c9c251..ee6bb89bc 100755 --- a/ietf/bin/create-break-sessions +++ b/ietf/bin/create-break-sessions @@ -4,9 +4,14 @@ # 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") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/create-charter-newrevisiondocevents b/ietf/bin/create-charter-newrevisiondocevents index a76631f1e..01fcc93cd 100755 --- a/ietf/bin/create-charter-newrevisiondocevents +++ b/ietf/bin/create-charter-newrevisiondocevents @@ -7,10 +7,16 @@ version = "0.10" program = os.path.basename(sys.argv[0]) progdir = os.path.dirname(sys.argv[0]) -# assume we're placed in ietf/bin/: -sys.path = [progdir+"/../../"] + sys.path +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + + # ---------------------------------------------------------------------- def note(string): sys.stdout.write("%s\n" % (string)) diff --git a/ietf/bin/dump-draft-info b/ietf/bin/dump-draft-info index a71b45f01..26c4cf185 100755 --- a/ietf/bin/dump-draft-info +++ b/ietf/bin/dump-draft-info @@ -7,9 +7,15 @@ version = "0.10" program = os.path.basename(sys.argv[0]) progdir = os.path.dirname(sys.argv[0]) -sys.path = [progdir+"/../../"] + sys.path +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + import django django.setup() diff --git a/ietf/bin/email-sync-discrepancies b/ietf/bin/email-sync-discrepancies index cd915fb80..c2117ebea 100755 --- a/ietf/bin/email-sync-discrepancies +++ b/ietf/bin/email-sync-discrepancies @@ -6,7 +6,11 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) from optparse import OptionParser diff --git a/ietf/bin/expire-ids b/ietf/bin/expire-ids index ea4dabefb..e574bd00b 100755 --- a/ietf/bin/expire-ids +++ b/ietf/bin/expire-ids @@ -3,7 +3,14 @@ import datetime, os import syslog -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) 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 9c460b267..06676799f 100755 --- a/ietf/bin/expire-last-calls +++ b/ietf/bin/expire-last-calls @@ -3,7 +3,14 @@ import datetime, os import syslog -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) 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 9af850ddd..772050f0b 100644 --- a/ietf/bin/expire-submissions +++ b/ietf/bin/expire-submissions @@ -3,8 +3,14 @@ import datetime, os import syslog -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/find-submission-confirmation-email-in-postfix-log b/ietf/bin/find-submission-confirmation-email-in-postfix-log index e7854b1d6..b34f86f2d 100644 --- a/ietf/bin/find-submission-confirmation-email-in-postfix-log +++ b/ietf/bin/find-submission-confirmation-email-in-postfix-log @@ -7,10 +7,15 @@ version = "0.10" program = os.path.basename(sys.argv[0]) progdir = os.path.dirname(sys.argv[0]) -# assume we're placed in ietf/bin/: -sys.path = [progdir+"/../../"] + sys.path +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + # ---------------------------------------------------------------------- def note(string): sys.stdout.write("%s\n" % (string)) diff --git a/ietf/bin/fix-ambiguous-document-timestamps b/ietf/bin/fix-ambiguous-document-timestamps index 5b2eb3b17..b1c73981f 100755 --- a/ietf/bin/fix-ambiguous-document-timestamps +++ b/ietf/bin/fix-ambiguous-document-timestamps @@ -14,7 +14,11 @@ import pytz filename = os.path.abspath(__file__) basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/generate-draft-aliases b/ietf/bin/generate-draft-aliases index a2a561958..1242c753a 100755 --- a/ietf/bin/generate-draft-aliases +++ b/ietf/bin/generate-draft-aliases @@ -27,10 +27,15 @@ TODO: # boilerplate (from various other ietf/bin scripts) import os, sys, re + filename = os.path.abspath(__file__) basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/generate-wg-aliases b/ietf/bin/generate-wg-aliases index 82eb185ed..5ad998bbc 100755 --- a/ietf/bin/generate-wg-aliases +++ b/ietf/bin/generate-wg-aliases @@ -15,10 +15,15 @@ mail lists: -ads, and -chairs # boilerplate (from various other ietf/bin scripts) import os, sys + filename = os.path.abspath(__file__) basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/iana-changes-updates b/ietf/bin/iana-changes-updates index fd35db16e..41b2a33d5 100755 --- a/ietf/bin/iana-changes-updates +++ b/ietf/bin/iana-changes-updates @@ -6,7 +6,11 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/iana-protocols-updates b/ietf/bin/iana-protocols-updates index 5d7182c33..e1df03023 100755 --- a/ietf/bin/iana-protocols-updates +++ b/ietf/bin/iana-protocols-updates @@ -3,12 +3,16 @@ import os, sys, re, json, datetime import syslog -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 -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + +syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django django.setup() diff --git a/ietf/bin/iana-review-email b/ietf/bin/iana-review-email index fe9750076..7e7794071 100755 --- a/ietf/bin/iana-review-email +++ b/ietf/bin/iana-review-email @@ -6,8 +6,11 @@ import syslog # boilerplate basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) diff --git a/ietf/bin/interim_minutes_reminder b/ietf/bin/interim_minutes_reminder index f4387e0a3..35c433682 100755 --- a/ietf/bin/interim_minutes_reminder +++ b/ietf/bin/interim_minutes_reminder @@ -12,7 +12,11 @@ don't have minutes. 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") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() @@ -20,4 +24,4 @@ django.setup() from ietf.meeting.helpers import check_interim_minutes -check_interim_minutes() \ No newline at end of file +check_interim_minutes() diff --git a/ietf/bin/merge-person-records b/ietf/bin/merge-person-records index c69ad4c0e..8ce00b0f0 100755 --- a/ietf/bin/merge-person-records +++ b/ietf/bin/merge-person-records @@ -16,7 +16,11 @@ conflicts with the moved one. 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") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/notify-expirations b/ietf/bin/notify-expirations index 45cf97367..967856a13 100755 --- a/ietf/bin/notify-expirations +++ b/ietf/bin/notify-expirations @@ -2,7 +2,14 @@ import datetime, os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/report_id_activity.py b/ietf/bin/report_id_activity.py index db253d03b..e863d9ad0 100644 --- a/ietf/bin/report_id_activity.py +++ b/ietf/bin/report_id_activity.py @@ -7,7 +7,11 @@ 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") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() diff --git a/ietf/bin/report_progress_report.py b/ietf/bin/report_progress_report.py index aa10e070f..ea52b0b6d 100644 --- a/ietf/bin/report_progress_report.py +++ b/ietf/bin/report_progress_report.py @@ -7,7 +7,11 @@ 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") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) import django django.setup() @@ -15,4 +19,4 @@ django.setup() from ietf.secr.drafts.reports import report_progress_report -print report_progress_report(sys.argv[1], sys.argv[2]), \ No newline at end of file +print report_progress_report(sys.argv[1], sys.argv[2]), diff --git a/ietf/bin/rfc-editor-index-updates b/ietf/bin/rfc-editor-index-updates index 430f1fe1a..67a727d83 100755 --- a/ietf/bin/rfc-editor-index-updates +++ b/ietf/bin/rfc-editor-index-updates @@ -4,12 +4,16 @@ import os, sys, re, json, datetime import syslog import traceback -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 -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + +syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django django.setup() diff --git a/ietf/bin/rfc-editor-queue-updates b/ietf/bin/rfc-editor-queue-updates index 65335bc18..476e4a97f 100755 --- a/ietf/bin/rfc-editor-queue-updates +++ b/ietf/bin/rfc-editor-queue-updates @@ -3,12 +3,16 @@ import os, sys, re, json, datetime import syslog -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 -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + +syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django django.setup() diff --git a/ietf/bin/send-scheduled-mail b/ietf/bin/send-scheduled-mail index 8adfd3021..c8009cf8a 100755 --- a/ietf/bin/send-scheduled-mail +++ b/ietf/bin/send-scheduled-mail @@ -3,7 +3,15 @@ import datetime, os, sys import syslog -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") +# boilerplate +basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +sys.path = [ basedir ] + sys.path +os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +virtualenv_activation = os.path.join(basedir, "bin", "activate_this.py") +if os.path.exists(virtualenv_activation): + execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django