Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 13:07:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Catch base django ObjectDoesNotExist to fix issue with custom XYRoom typeclasses leaking the base exception when creating

Browse source
This commit is contained in:
ChrisLR 2021-08-31 07:32:34 -04:00
parent 789cc78a05
commit c5c14d8049
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/contrib/xyzgrid/xymap_legend.py
View file

@ -18,8 +18,10 @@ except ImportError as err:
import uuid
from collections import defaultdict
from django.core import exceptions as django_exceptions
from evennia.prototypes import spawner
from evennia.utils.utils import make_iter
from .utils import MAPSCAN, REVERSE_DIRECTIONS, MapParserError, BIGVAL
NodeTypeclass = None
@ -309,7 +311,7 @@ class MapNode:
try:
nodeobj = NodeTypeclass.objects.get_xyz(xyz=xyz)
except NodeTypeclass.DoesNotExist:
except django_exceptions.ObjectDoesNotExist:
# create a new entity with proper coordinates etc
tclass = self.prototype['typeclass']
tclass = (f' ({tclass})'
@ -433,7 +435,7 @@ class MapNode:
try:
nodeobj = NodeTypeclass.objects.get_xyz(xyz=xyz)
except NodeTypeclass.DoesNotExist:
except django_exceptions.ObjectDoesNotExist:
# no object exists
pass
else: