Resolve merge conflicts with master.

evennia/server/evennia_launcher.py

@@ -161,7 +161,7 @@ ERROR_SETTINGS = \
         1) You are not running this command from your game directory.
            Change directory to your game directory and try again (or
            create a new game directory using evennia --init <dirname>)
-        2) The ettings file contains a syntax error. If you see a
+        2) The settings file contains a syntax error. If you see a
            traceback above, review it, resolve the problem and try again.
         3) Django is not correctly installed. This usually shows as
            errors mentioning 'DJANGO_SETTINGS_MODULE'. If you run a
@@ -315,7 +315,7 @@ ERROR_LOGDIR_MISSING = \
     will be created automatically).
 
     (Explanation: Evennia creates the log directory automatically when
-    initializating a new game directory. This error usually happens if
+    initializing a new game directory. This error usually happens if
     you used git to clone a pre-created game directory - since log
     files are in .gitignore they will not be cloned, which leads to
     the log directory also not being created.)
@@ -1329,7 +1329,7 @@ def main():
                         arg, value = [p.strip() for p in arg.split("=", 1)]
                     else:
                         value = True
-                    kwargs[arg.lstrip("--")] = [value]
+                    kwargs[arg.lstrip("--")] = value
                 else:
                     args.append(arg)
         try:

evennia/server/evennia_runner.py

@@ -3,7 +3,7 @@
 
 This runner is controlled by the evennia launcher and should normally
 not be launched directly.  It manages the two main Evennia processes
-(Server and Portal) and most importanly runs a passive, threaded loop
+(Server and Portal) and most importantly runs a passive, threaded loop
 that makes sure to restart Server whenever it shuts down.
 
 Since twistd does not allow for returning an optional exit code we
@@ -137,7 +137,7 @@ def cycle_logfile(logfile):
 
 def start_services(server_argv, portal_argv, doexit=False):
     """
-    This calls a threaded loop that launces the Portal and Server
+    This calls a threaded loop that launches the Portal and Server
     and then restarts them when they finish.
     """
     global SERVER, PORTAL

evennia/server/portal/irc.py

@@ -93,6 +93,7 @@ IRC_COLOR_MAP = dict([
     (r'|_', " "),         # space
     (r'|*', ""),          # invert
     (r'|^', ""),          # blinking text
+    (r'|h', IRC_BOLD),    # highlight, use bold instead
 
     (r'|r', IRC_COLOR + IRC_RED),
     (r'|g', IRC_COLOR + IRC_GREEN),

evennia/server/server.py

@@ -455,6 +455,11 @@ class Evennia(object):
         # (this also starts any that didn't yet start)
         ScriptDB.objects.validate(init_mode=mode)
 
+        # start the task handler
+        from evennia.scripts.taskhandler import TASK_HANDLER
+        TASK_HANDLER.load()
+        TASK_HANDLER.create_delays()
+
         # delete the temporary setting
         ServerConfig.objects.conf("server_restart_mode", delete=True)
 

evennia/server/sessionhandler.py

@@ -201,7 +201,12 @@ class SessionHandler(dict):
                 if _INLINEFUNC_ENABLED and not raw and isinstance(self, ServerSessionHandler):
                     # only parse inlinefuncs on the outgoing path (sessionhandler->)
                     data = parse_inlinefunc(data, strip=strip_inlinefunc, session=session)
-                return data
+                # At this point the object is certainly the right encoding, but may still be a unicode object--
+                # to_str does not actually force objects to become bytestrings.
+                # If the unicode object is a subclass of unicode, such as ANSIString, this can cause a problem,
+                # as special behavior for that class will still be in play. Since we're now transferring raw data,
+                # we must now force this to be a proper bytestring.
+                return str(data)
             elif hasattr(data, "id") and hasattr(data, "db_date_created") \
                     and hasattr(data, '__dbclass__'):
                 # convert database-object to their string representation.