Removed ev.py - merged it into evennia.__init__.py.

This commit is contained in:
Griatch 2015-01-07 13:53:11 +01:00
parent c7325a5032
commit 096c9a6276
3 changed files with 15 additions and 280 deletions

View file

@ -409,6 +409,10 @@ def init_game_directory(path):
# Add gamedir to python path
sys.path.insert(0, GAMEDIR)
# testing the main library import. If there are errors in importing
# the main library, it should show here.
importlib.import_module("evennia")
# test existence of the settings module
try:
settings = importlib.import_module(SETTINGS_DOTPATH)
@ -419,7 +423,7 @@ def init_game_directory(path):
print ERROR_SETTINGS
sys.exit()
# Prepare djangO; set the settings location
# Prepare django; set the settings location
os.environ['DJANGO_SETTINGS_MODULE'] = SETTINGS_DOTPATH
import django
# required since django1.7.