From 76dc0545c47c7b736c62c7f21556e0afc6857e92 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Sun, 15 Nov 2015 20:40:03 +0000 Subject: [PATCH] Remove unused traceback imports. --- evennia/contrib/email_login.py | 1 - evennia/contrib/menu_login.py | 1 - evennia/objects/objects.py | 11 +---------- evennia/utils/batchprocessors.py | 1 - evennia/utils/utils.py | 1 - 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/evennia/contrib/email_login.py b/evennia/contrib/email_login.py index 8b46cec3a..5d30b67e3 100644 --- a/evennia/contrib/email_login.py +++ b/evennia/contrib/email_login.py @@ -30,7 +30,6 @@ the module given by settings.CONNECTION_SCREEN_MODULE. """ import re -import traceback from django.conf import settings from evennia.players.models import PlayerDB from evennia.objects.models import ObjectDB diff --git a/evennia/contrib/menu_login.py b/evennia/contrib/menu_login.py index 92092bf8c..41c0e7685 100644 --- a/evennia/contrib/menu_login.py +++ b/evennia/contrib/menu_login.py @@ -27,7 +27,6 @@ login. You can change the screen used by editing """ import re -import traceback from django.conf import settings from evennia import managers from evennia import utils, logger, create_player diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 7604b995b..712f20fc7 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -8,7 +8,6 @@ entities. from builtins import object from future.utils import listvalues, with_metaclass -import traceback from django.conf import settings from evennia.typeclasses.models import TypeclassBase @@ -560,10 +559,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): """ def logerr(string=""): "Simple log helper method" - trc = traceback.format_exc() - errstring = "%s%s" % (trc, string) logger.log_trace() - self.msg(errstring) + self.msg(string) errtxt = _("Couldn't perform move ('%s'). Contact an admin.") if not emit_to_obj: @@ -588,7 +585,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): return except Exception: logerr(errtxt % "at_before_move()") - #emit_to_obj.msg(errtxt % "at_before_move()") return False # Save the old location @@ -608,7 +604,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): source_location.at_object_leave(self, destination) except Exception: logerr(errtxt % "at_object_leave()") - #emit_to_obj.msg(errtxt % "at_object_leave()") return False if not quiet: @@ -617,7 +612,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): self.announce_move_from(destination) except Exception: logerr(errtxt % "at_announce_move()") - #emit_to_obj.msg(errtxt % "at_announce_move()" ) return False # Perform move @@ -634,7 +628,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): self.announce_move_to(source_location) except Exception: logerr(errtxt % "announce_move_to()") - #emit_to_obj.msg(errtxt % "announce_move_to()") return False if move_hooks: @@ -644,7 +637,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): destination.at_object_receive(self, source_location) except Exception: logerr(errtxt % "at_object_receive()") - #emit_to_obj.msg(errtxt % "at_object_receive()") return False # Execute eventual extra commands on this object after moving it @@ -654,7 +646,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)): self.at_after_move(source_location) except Exception: logerr(errtxt % "at_after_move") - #emit_to_obj.msg(errtxt % "at_after_move()") return False return True diff --git a/evennia/utils/batchprocessors.py b/evennia/utils/batchprocessors.py index 2c9fd9234..3a94d72ac 100644 --- a/evennia/utils/batchprocessors.py +++ b/evennia/utils/batchprocessors.py @@ -145,7 +145,6 @@ Example batch.py file ``` #HEADER -import traceback from django.config import settings from evennia.utils import create from types import basetypes diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 4bb256903..acf2b8336 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -16,7 +16,6 @@ import math import re import textwrap import random -import traceback from importlib import import_module from inspect import ismodule, trace from collections import defaultdict