Author: esr
Date: Tue Mar 31 02:53:35 2009
New Revision: 34317
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34317&view=rev
Log:
More improvements in conveniwnce methods.
The tag for a macro opener has had '}' removed, to make it
visually clear that it is unbalanced.
Modified:
trunk/data/tools/wesnoth/wmliterator.py
Modified: trunk/data/tools/wesnoth/wmliterator.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth/wmliterator.py?rev=34317&r1=34316&r2=34317&view=diff
==============================================================================
--- trunk/data/tools/wesnoth/wmliterator.py (original)
+++ trunk/data/tools/wesnoth/wmliterator.py Tue Mar 31 02:53:35 2009
@@ -83,10 +83,12 @@
return type(elem) == type("") and elem.startswith("{")
def isAttribute(elem):
- "Are we looking at an attribute?"
- if isinstance(elem, WmlIterator):
- elem = elem.element
- return type(elem) == type(()) or (type(elem) == type("") and
elem.endswith("="))
+ "Are we looking at an attribute (or attribute tuple)?"
+ if isinstance(elem, WmlIterator):
+ elem = elem.element
+ if type(elem) == type(()):
+ elem = elem[0]
+ return type(elem) == type("") and elem.endswith("=")
class WmlIterator(object):
"""Return an iterable WML navigation object.
@@ -254,7 +256,7 @@
if k:
elements.append((k+'=', m.start()+i, 0))
for m in macroOpenPattern.finditer(text):
- elements.append((m.group(1)+'}', m.start(), 1))
+ elements.append((m.group(1), m.start(), 1))
for m in macroClosePattern.finditer(text):
elements.append((closeMacroType, m.start(), -1))
#sort by start position
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
