Fixed many path-related issues, getting closing to getting the server to boot.

evennia/__init__.py

@@ -54,7 +54,6 @@ create_message = None
 lockfuncs = None
 tickerhandler = None
 logger = None
-utils = None
 gametime = None
 ansi = None
 spawn = None
@@ -125,7 +124,6 @@ def init():
     from locks import lockfuncs
     from scripts.tickerhandler import TICKER_HANDLER as tickerhandler
     from utils import logger
-    from utils import utils
     from utils import gametime
     from utils import ansi
     from utils.spawner import spawn

evennia/commands/default/player.py

@@ -25,7 +25,8 @@ from evennia.server.sessionhandler import SESSIONS
 from evennia.commands.default.muxcommand import MuxPlayerCommand
 from evennia.utils import utils, create, search, prettytable
 
-from settings import MAX_NR_CHARACTERS, MULTISESSION_MODE
+MAX_NR_CHARACTERS = settings.MAX_NR_CHARACTERS
+MULTISESSION_MODE = settings.MULTISESSION_MODE
 
 # limit symbol import for API
 __all__ = ("CmdOOCLook", "CmdIC", "CmdOOC", "CmdPassword", "CmdQuit",

evennia/server/portal/portal.py

@@ -10,21 +10,25 @@ by game/evennia.py).
 
 import sys
 import os
-if os.name == 'nt':
-    # For Windows batchfile we need an extra path insertion here.
-    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
-                os.path.dirname(os.path.abspath(__file__))))))
-from evennia.server.webserver import EvenniaReverseProxyResource
+
+# add core Evennia directory
+sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.dirname(
+             os.path.dirname(os.path.abspath(__file__))))))
+sys.path.insert(1, os.getcwd())
+
 from twisted.application import internet, service
 from twisted.internet import protocol, reactor
 from twisted.web import server
 import django
-
 django.setup()
-
 from django.conf import settings
+
+import evennia
+evennia.init()
+
 from evennia.utils.utils import get_evennia_version, mod_import, make_iter
 from evennia.server.portal.portalsessionhandler import PORTAL_SESSIONS
+from evennia.server.webserver import EvenniaReverseProxyResource
 
 PORTAL_SERVICES_PLUGIN_MODULES = [mod_import(module) for module in make_iter(settings.PORTAL_SERVICES_PLUGIN_MODULES)]
 

evennia/server/server.py

@@ -10,16 +10,20 @@ by game/evennia.py).
 import time
 import sys
 import os
-if os.name == 'nt':
-    # For Windows batchfile we need an extra path insertion here.
-    sys.path.insert(0, os.path.dirname(os.path.dirname(
+
+# add core Evennia directory
+sys.path.insert(1, os.path.dirname(os.path.dirname(
                 os.path.dirname(os.path.abspath(__file__)))))
+
 from twisted.web import server, static
 from twisted.application import internet, service
 from twisted.internet import reactor, defer
 import django
 django.setup()
 
+import evennia
+evennia.init()
+
 from django.db import connection
 from django.conf import settings
 
@@ -103,7 +107,7 @@ class Evennia(object):
         application - an instantiated Twisted application
 
         """
-        sys.path.append('.')
+        sys.path.insert(1, '.')
 
         # create a store of services
         self.services = service.IServiceCollection(application)

evennia/server/webserver.py

@@ -20,9 +20,10 @@ from twisted.web.proxy import ReverseProxyResource
 from twisted.web.server import NOT_DONE_YET
 
 from twisted.web.wsgi import WSGIResource
+from django.conf import settings
 from django.core.handlers.wsgi import WSGIHandler
 
-from settings import UPSTREAM_IPS
+UPSTREAM_IPS = settings.UPSTREAM_IPS
 
 
 #

evennia/utils/__init__.py

@@ -3,3 +3,5 @@ try:
     import __pypy__ as is_pypy
 except ImportError:
     is_pypy = False
+
+from utils import *

evennia/utils/dummyrunner/dummyrunner.py

@@ -40,8 +40,11 @@ from twisted.internet import reactor, protocol
 from twisted.internet.task import LoopingCall
 
 # Tack on the root evennia directory to the python path and initialize django settings
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
-os.environ["DJANGO_SETTINGS_MODULE"] = "game.settings"
+
+#TODO
+#sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
+#os.environ["DJANGO_SETTINGS_MODULE"] = "game.settings"
+
 #from game import settings
 #try:
 #    from django.conf import settings as settings2

evennia/utils/dummyrunner/memplot.py

@@ -8,8 +8,9 @@ Call this module directly to plot the log (requires matplotlib and numpy).
 """
 import os, sys
 import time
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
+#TODO!
+#sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
+#os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
 import ev
 from evennia.utils.idmapper import base as _idmapper
 

evennia/utils/dummyrunner/test_queries.py

@@ -4,8 +4,8 @@ query as well as count them for optimization testing.
 
 """
 import sys, os
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
-os.environ["DJANGO_SETTINGS_MODULE"] = "game.settings"
+#sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
+#os.environ["DJANGO_SETTINGS_MODULE"] = "game.settings"
 from django.db import connection
 
 

evennia/utils/spawner.py

@@ -70,8 +70,9 @@ many traits with a normal goblin.
 """
 
 import os, sys, copy
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
+#TODO
+#sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+#os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
 
 from django.conf import settings
 from random import randint

evennia/utils/utils.py

@@ -16,6 +16,7 @@ import textwrap
 import datetime
 import random
 import traceback
+from subprocess import check_output
 from importlib import import_module
 from inspect import ismodule
 from collections import defaultdict
@@ -304,6 +305,17 @@ def host_os_is(osname):
 
 
 def get_evennia_version():
+    """
+    Get the Evennia version info from the main package.
+    """
+    version = "Unknown"
+    with open(os.path.join(settings.ROOT_DIR, "VERSION.txt"), 'r') as f:
+        version = f.read().strip()
+    try:
+        version = "%s (rev %s)" % (version, check_output("git rev-parse --short HEAD", shell=True, cwd=settings.ROOT_DIR).strip())
+    except IOError:
+        pass
+    return version
     """
     Check for the evennia version info.
     """