Changed to Django1.7. Django 1.6 no longer supported. To change, upgrade django to 1.7+ and then run manage.py migrate, possibly followed by manage.py migrate --fake for objects and players.
This commit is contained in:
parent
1fc91f85ea
commit
bb36f2cb76
20 changed files with 431 additions and 14 deletions
|
|
@ -14,6 +14,7 @@ import sys
|
|||
import signal
|
||||
from optparse import OptionParser
|
||||
from subprocess import Popen
|
||||
import django
|
||||
|
||||
# Set the Python path up so we can get to settings.py from here.
|
||||
from django.core import management
|
||||
|
|
@ -29,6 +30,9 @@ if not os.path.exists('settings.py'):
|
|||
import game.manage
|
||||
sys.exit()
|
||||
|
||||
# required since django1.7.
|
||||
django.setup()
|
||||
|
||||
# signal processing
|
||||
SIG = signal.SIGINT
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import sys
|
|||
from optparse import OptionParser
|
||||
from subprocess import Popen
|
||||
import Queue, thread
|
||||
import django
|
||||
|
||||
try:
|
||||
# check if launched with pypy
|
||||
|
|
@ -45,6 +46,8 @@ if not os.path.exists('settings.py'):
|
|||
print "No settings.py file found. Run evennia.py to create it."
|
||||
sys.exit()
|
||||
|
||||
django.setup()
|
||||
|
||||
# Get the settings
|
||||
from django.conf import settings
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue