sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-02-05 22:43:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed target symbol parsing in pre-typed capabilities

Browse Source 
Also renamed CONT to CONTAINER on certain symbols
This commit is contained in:
Bahadir Balban
2009-11-17 12:34:59 +02:00
parent 8856609896
commit b933db1e36
3 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/caps.py
View File

@@ -196,16 +196,20 @@ def prepare_typed_capability(cont, param, val):
elif 'TARGET' in params:
# Get reference to capability string template
templ = Template(cont.caps[captype])
target, ttype = params.split('_', 1)
# Two types of strings are expected here: TARGET or TARGET_TARGETTYPE
# If TARGET, the corresponding value is in val
target_parts = params.split('_', 1)
# Target type
if ttype != None:
if len(target_parts) == 2:
ttype = target_parts[1]
# Insert current container id, if target has current
if ttype[:len('CURRENT')] == 'CURRENT':
cont.caps[captype] = templ.safe_substitute(target_type = ttype, cid = cont.id)
else:
cont.caps[captype] = templ.safe_substitute(target_type = ttype)
# Get target value supplied by user
# Get target value supplied by user in val
else:
cont.caps[captype] = templ.safe_substitute(cid = val)