Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run "futurize -1 -w -n ."

Browse source
This commit is contained in:
Russell Jones 2015-10-01 20:00:28 +01:00
parent 7f11256fc8
commit 06c3dc0ed3
55 changed files with 281 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/objects/__init__.py
View file

@ -3,4 +3,5 @@ This sub-package defines the basic in-game "Object". All in-game
objects inherit from classes in this package.
"""
from objects import DefaultObject, DefaultRoom, DefaultExit, DefaultCharacter
from __future__ import absolute_import
from .objects import DefaultObject, DefaultRoom, DefaultExit, DefaultCharacter

2
evennia/objects/models.py
View file

@ -267,7 +267,7 @@ class ObjectDB(TypedObject):
errmsg = "Error: %s.location = %s creates a location loop." % (self.key, location)
logger.log_errmsg(errmsg)
raise #RuntimeError(errmsg)
except Exception, e:
except Exception as e:
errmsg = "Error (%s): %s is not a valid location." % (str(e), location)
logger.log_errmsg(errmsg)
raise #Exception(errmsg)