Merged conflicts.

evennia/utils/create.py

@@ -245,7 +245,7 @@ def create_help_entry(key, entrytext, category="General", locks=None):
         return new_help
     except IntegrityError:
         string = "Could not add help entry: key '%s' already exists." % key
-        logger.log_errmsg(string)
+        logger.log_err(string)
         return None
     except Exception:
         logger.log_trace()

evennia/utils/dbserialize.py

@@ -113,7 +113,7 @@ class _SaverMutable(object):
         elif self._db_obj:
             self._db_obj.value = self
         else:
-            logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self)
+            logger.log_err("_SaverMutable %s has no root Attribute to save to." % self)
 
     def _convert_mutables(self, data):
         "converts mutables to Saver* variants and assigns .parent property"

evennia/utils/idmapper/models.py

@@ -524,8 +524,8 @@ def conditional_flush(max_rmem, force=False):
 
     if ((now - LAST_FLUSH) < AUTO_FLUSH_MIN_INTERVAL) and not force:
         # too soon after last flush.
-        logger.log_warnmsg("Warning: Idmapper flush called more than "\
-                            "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL/60.0))
+        logger.log_warn("Warning: Idmapper flush called more than "\
+                        "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL/60.0))
         return
 
     if os.name == "nt":

evennia/utils/utils.py

@@ -1176,7 +1176,7 @@ def init_new_player(player):
     Deprecated.
     """
     from evennia.utils import logger
-    logger.log_depmsg("evennia.utils.utils.init_new_player is DEPRECATED and should not be used.")
+    logger.log_dep("evennia.utils.utils.init_new_player is DEPRECATED and should not be used.")
 
 
 def string_similarity(string1, string2):