Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more code clean up. clean up only.

Browse Source 
svn: r19653
This commit is contained in:
Craig J. Anderson 2012-05-25 23:43:40 +00:00
parent c0eaa76d68
commit e860f32d51
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/lib/libsubstkeyword.py
View File

@ -118,6 +118,8 @@ class GenericFormat(object):
tmp = tmp.upper() tmp = tmp.upper()
if tmp == "" or tmp is None: if tmp == "" or tmp is None:
main.add_remove() main.add_remove()
elif isinstance(tmp, VarString): #events cause this
main.extend(tmp)
else: else:
main.add_variable(tmp) main.add_variable(tmp)
elif separator.is_a(): elif separator.is_a():
@ -128,10 +130,7 @@ class GenericFormat(object):
if self.string_in.this == ")": if self.string_in.this == ")":
self.string_in.step() self.string_in.step()
if main.state == TXT.remove: return main
return None
else:
return main.get_final()[1]
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# Name Format strings # Name Format strings
@ -943,6 +942,8 @@ class SubstKeywords(object):
rtrn = variable.parse_format() rtrn = variable.parse_format()
if rtrn is None: if rtrn is None:
curr_var.add_remove() curr_var.add_remove()
elif isinstance(rtrn, VarString):
curr_var.extend(rtrn)
else: else:
curr_var.add_variable(rtrn) curr_var.add_variable(rtrn)