Skip to content

Commit 1210f77

Browse files
committed
With django 1.7, standalone scripts need to call django.setup() before doing any operations involving models. Modified all scripts in bin/ and ietf/bin/ which seemed to need it.
- Legacy-Id: 9017
1 parent 375b8d8 commit 1210f77

9 files changed

Lines changed: 32 additions & 6 deletions

bin/graph-models

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# Requires modelviz.py from
66
# http://code.djangoproject.com/wiki/DjangoGraphviz
77
#
8-
PYTHONPATH=`dirname $PWD`
8+
cd ${0%/*}/../ietf
9+
PYTHONPATH=`dirname $PWD`:`dirname $PWD/..`
910
export PYTHONPATH
1011
module=${PWD##*/}
1112
DJANGO_SETTINGS_MODULE=$module.settings
@@ -18,4 +19,4 @@ do
1819
fi
1920
done
2021
modelviz.py $* $models > models.dot
21-
dot -Tpng models.dot
22+
dot -Tpng models.dot > models.png

bin/test-crawl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../"))
77
sys.path = [ basedir ] + sys.path
88
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
99

10+
import django
1011
import django.test
1112
from django.conf import settings
1213

@@ -74,6 +75,7 @@ def extract_html_urls(content):
7475

7576
yield url
7677

78+
django.setup()
7779
client = django.test.Client()
7880

7981
for url in initial_urls:

ietf/bin/announce-header-change

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
#!/usr/bin/env python
22

3+
import sys, os
34
import datetime
45

6+
# boilerplate
7+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
8+
sys.path = [ basedir ] + sys.path
9+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
10+
11+
import django
512
from django.core import management
613
from django.template.loader import render_to_string
714

815
from ietf import settings
916
from ietf.utils.mail import send_mail_preformatted
1017
from ietf.utils.mail import send_mail
1118

12-
management.setup_environ(settings)
19+
django.setup()
1320

1421
target_date=datetime.date(year=2014,month=1,day=24)
1522

ietf/bin/create-charter-newrevisiondocevents

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ def warn(string):
2424
import re
2525
from datetime import datetime as Datetime
2626

27+
import django
2728
from django.conf import settings
2829

2930
from ietf.utils.path import path as Path
3031
from ietf.doc.models import Document, NewRevisionDocEvent
3132
from ietf.person.models import Person
3233

34+
django.setup()
3335
system_entity = Person.objects.get(name="(System)")
3436

3537
charterdir = Path(settings.CHARTER_PATH)
@@ -60,4 +62,4 @@ for file in charterdir.files("charter-ietf-*.txt"):
6062
note("Created new NewRevisionDocEvent for %s-%s" % (name, rev))
6163
except Document.DoesNotExist:
6264
warn("Document not found: '%s'; no NewRevisionDocEvent created for '%s'" % (name, fname))
63-
65+

ietf/bin/dump-draft-info

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ progdir = os.path.dirname(sys.argv[0])
1010
sys.path = [progdir+"/../../"] + sys.path
1111
os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
1212

13+
import django
1314
from django.template import Template, Context
1415

1516
from ietf.doc.models import Document
1617
from ietf.person.models import Person
1718

19+
django.setup()
20+
1821
drafts = Document.objects.filter(type="draft")
1922

2023
ads = {}

ietf/bin/generate-draft-aliases

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
3434
sys.path = [ basedir ] + sys.path
3535
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
3636

37+
import django
3738
from django.conf import settings
3839

3940
from ietf.doc.models import Document
4041
from ietf.group.utils import get_group_chairs_emails, get_group_ads_emails
4142
from ietf.utils.aliases import *
4243
import time
4344

45+
django.setup()
46+
4447
def get_draft_ad_emails(draft):
4548
" Get AD email for the given draft, if any. "
4649
# If working group document, return current WG ADs
@@ -148,4 +151,4 @@ if __name__ == '__main__':
148151

149152
afile.close()
150153
vfile.close()
151-
154+

ietf/bin/generate-wg-aliases

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
2020
sys.path = [ basedir ] + sys.path
2121
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
2222

23+
import django
2324
from django.conf import settings
2425

2526
from ietf.group.models import Group
2627
from ietf.group.utils import get_group_ads_emails, get_group_chairs_emails, get_area_ads_emails, get_area_chairs_emails
2728
from ietf.person.models import Email
2829
from ietf.utils.aliases import *
2930

31+
django.setup()
32+
3033
# from secr/utils/group.py..
3134
ACTIVE_STATES=['active', 'bof', 'proposed']
3235

ietf/bin/iana-protocols-updates

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
1010
sys.path = [ basedir ] + sys.path
1111
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
1212

13-
13+
import django
1414
from django.conf import settings
1515
from ietf.sync.iana import *
1616

17+
django.setup()
18+
1719
def chunks(l, n):
1820
"""Split list l up in chunks of max size n."""
1921
return (l[i:i+n] for i in xrange(0, len(l), n))

ietf/bin/rfc-editor-queue-updates

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ sys.path = [ basedir ] + sys.path
1111
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
1212

1313

14+
import django
1415
from django.conf import settings
1516
from ietf.sync.rfceditor import *
1617

18+
django.setup()
19+
1720
syslog.syslog("Updating RFC Editor queue states from %s" % settings.RFC_EDITOR_QUEUE_URL)
1821

1922
response = fetch_queue_xml(settings.RFC_EDITOR_QUEUE_URL)

0 commit comments

Comments
 (0)