From c0aafe74ab08c523816c996a722d5ca283c9a557 Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 26 Feb 2015 19:56:14 +0100 Subject: [PATCH] Removed old deprecation warnings for data= keyword in msg(). The data= keyword is no longer supported. --- evennia/objects/objects.py | 8 -------- evennia/players/players.py | 7 ------- 2 files changed, 15 deletions(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index e2b4cc46b..7ed64cb50 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -490,7 +490,6 @@ class DefaultObject(ObjectDB): command structure. """ # nick replacement - we require full-word matching. - # do text encoding conversion raw_string = to_unicode(raw_string) raw_string = self.nicks.nickreplace(raw_string, @@ -519,13 +518,6 @@ class DefaultObject(ObjectDB): text = to_str(text, force_string=True) if text else "" - if "data" in kwargs: - # deprecation warning - log_depmsg("ObjectDB.msg(): 'data'-dict keyword is deprecated. Use **kwargs instead.") - data = kwargs.pop("data") - if isinstance(data, dict): - kwargs.update(data) - if from_obj: # call hook try: diff --git a/evennia/players/players.py b/evennia/players/players.py index 1a0ea7ddf..8cd67b1af 100644 --- a/evennia/players/players.py +++ b/evennia/players/players.py @@ -339,13 +339,6 @@ class DefaultPlayer(PlayerDB): and handles the sessid). Can also be a list of sessids. kwargs (dict) - All other keywords are parsed as extra data. """ - if "data" in kwargs: - # deprecation warning - logger.log_depmsg("PlayerDB:msg() 'data'-dict keyword is deprecated. Use **kwargs instead.") - data = kwargs.pop("data") - if isinstance(data, dict): - kwargs.update(data) - text = to_str(text, force_string=True) if text else "" if from_obj: # call hook