crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid DeprecationWarning: raising a string exception is deprecated by making 

a user-defined exception handler.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10423 282e977c-c81d-0410-88c4-b93c2d0d6712
master
kbulgrien 2008-11-14 04:44:17 +00:00
parent 7e26094865
commit 5b1661b029
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/misc/npc_dialog.py
View File

@ -95,6 +95,15 @@ import os
from CFDialog import DialogRule, Dialog from CFDialog import DialogRule, Dialog
import cjson import cjson
# Avoid DeprecationWarning: raising a string exception is deprecated by making
# a user-defined exception handler.
#
class NPC_Dialog_Error(Exception):
def __init__(self, value):
self.value = value
def __str__(self):
return repr(self.value)
def ruleConnected(character,rule): def ruleConnected(character,rule):
m = character.Map m = character.Map
m.TriggerConnected(rule.connected,1) m.TriggerConnected(rule.connected,1)
@ -106,7 +115,7 @@ if (Crossfire.ScriptParameters() != None):
try: try:
f = open(filename,'rb') f = open(filename,'rb')
except: except:
raise 'Unable to read %s' % filename NPC_Dialog_Error('Unable to read %s' % filename)
else: else:
Crossfire.Log(Crossfire.LogDebug,"Reading from file %s" %filename) Crossfire.Log(Crossfire.LogDebug,"Reading from file %s" %filename)
parameters=cjson.decode(f.read()) parameters=cjson.decode(f.read())