Merging in local changes.

game/evennia.py

@@ -129,11 +129,9 @@ PORTAL_LOGFILE = settings.PORTAL_LOG_FILE
 
 # Check so a database exists and is accessible
 from django.db import DatabaseError
-from src.objects.models import ObjectDB
+from src.players.models import PlayerDB
 try:
-    test = ObjectDB.objects.get(id=1)
-except ObjectDB.DoesNotExist:
-    pass # this is fine at this point
+    superuser = PlayerDB.objects.get(id=1)
 except DatabaseError,e:
     print """
     Your database does not seem to be set up correctly.
@@ -147,6 +145,11 @@ except DatabaseError,e:
     When you have a database set up, rerun evennia.py.
     """ % e
     sys.exit()
+except PlayerDB.DoesNotExist:
+    # no superuser yet. We need to create it.
+    from django.core.management import call_command
+    print "\nCreate a superuser below. The superuser is Player #1, the 'owner' account of the server.\n"
+    call_command("createsuperuser", interactive=True)
 
 # Add this to the environmental variable for the 'twistd' command.
 currpath = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -403,6 +406,7 @@ def error_check_python_modules():
     deprstring = "settings.%s should be renamed to %s. If defaults are used, their path/classname must be updated (see src/settings_default.py)."
     if hasattr(settings, "CMDSET_DEFAULT"): raise DeprecationWarning(deprstring % ("CMDSET_DEFAULT", "CMDSET_CHARACTER"))
     if hasattr(settings, "CMDSET_OOC"): raise DeprecationWarning(deprstring % ("CMDSET_OOC", "CMDSET_PLAYER"))
+    if settings.WEBSERVER_ENABLED and not isinstance(settings.WEBSERVER_PORTS[0], tuple): raise DeprecationWarning("settings.WEBSERVER_PORTS must be on the form [(proxyport, serverport), ...]")
 
     from src.commands import cmdsethandler
     if not cmdsethandler.import_cmdset(settings.CMDSET_UNLOGGEDIN, None): print "Warning: CMDSET_UNLOGGED failed to load!"

game/gamesrc/objects/examples/object.py

@@ -71,8 +71,8 @@ class Object(DefaultObject):
 
      search(ostring, global_search=False, attribute_name=None, use_nicks=False, location=None, ignore_errors=False, player=False)
      execute_cmd(raw_string)
-     msg(message, from_obj=None, data=None)
-     msg_contents(message, exclude=None, from_obj=None, data=None)
+     msg(text=None, **kwargs)
+     msg_contents(message, exclude=None, from_obj=None, **kwargs)
      move_to(destination, quiet=False, emit_to_obj=None, use_destination=True)
      copy(new_key=None)
      delete()
@@ -113,9 +113,9 @@ class Object(DefaultObject):
      at_after_traverse(traversing_object, source_location) - (exit-objects only) called just after a traversal has happened.
      at_failed_traverse(traversing_object)      - (exit-objects only) called if traversal fails and property err_traverse is not defined.
 
-     at_msg_receive(self, msg, from_obj=None, data=None) - called when a message (via self.msg()) is sent to this obj.
+     at_msg_receive(self, msg, from_obj=None, **kwargs) - called when a message (via self.msg()) is sent to this obj.
                                                            If returns false, aborts send.
-     at_msg_send(self, msg, to_obj=None, data=None) - called when this objects sends a message to someone via self.msg().
+     at_msg_send(self, msg, to_obj=None, **kwargs) - called when this objects sends a message to someone via self.msg().
 
      return_appearance(looker) - describes this object. Used by "look" command by default
      at_desc(looker=None)      - called by 'look' whenever the appearance is requested.

game/gamesrc/objects/examples/player.py

@@ -59,7 +59,7 @@ class Player(DefaultPlayer):
 
     * Helper methods
 
-     msg(outgoing_string, from_obj=None, data=None)
+     msg(text=None, **kwargs)
      swap_character(new_character, delete_old_character=False)
      execute_cmd(raw_string, sessid=None)
      search(ostring, global_search=False, attribute_name=None, use_nicks=False, location=None, ignore_errors=False, player=False)

game/runner.py

@@ -50,7 +50,7 @@ from django.conf import settings
 
 # Setup access of the evennia server itself
 SERVER_PY_FILE = os.path.join(settings.SRC_DIR, 'server/server.py')
-PORTAL_PY_FILE = os.path.join(settings.SRC_DIR, 'server/portal.py')
+PORTAL_PY_FILE = os.path.join(settings.SRC_DIR, 'server/portal/portal.py')
 
 # Get logfile names
 SERVER_LOGFILE = settings.SERVER_LOG_FILE