Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-26 01:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' into fix/prototyped-diff

Browse source
This commit is contained in:
Griatch 2018-09-15 17:10:54 +02:00
commit ce4db6cbab
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/__init__.py
View file

@ -365,7 +365,6 @@ def set_trace(debugger="auto", term_size=(140, 40)):
import pdb
dbg = pdb.Pdb(stdout=sys.__stdout__)
#
# stopped at breakpoint. Use 'n' (next) to continue into the code.
#
dbg.set_trace()
# Start debugger, forcing it up one stack frame (otherwise `set_trace` will start # debugger at
# this point, not the actual code location)
dbg.set_trace(sys._getframe().f_back)

6
evennia/locks/lockhandler.py
View file

@ -664,9 +664,9 @@ def validate_lockstring(lockstring):
if no error was found.
"""
global _LOCKHANDLER
if not _LOCKHANDLER:
_LOCKHANDLER = LockHandler(_ObjDummy())
global _LOCK_HANDLER
if not _LOCK_HANDLER:
_LOCK_HANDLER = LockHandler(_ObjDummy())
return _LOCK_HANDLER.validate(lockstring)