summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2018-08-05 12:26:12 +0300
committerSergey Poznyakoff <gray@gnu.org>2018-08-05 12:26:12 +0300
commit8d24e13c1caddd6163972cb6bb7c58815346a202 (patch)
tree46542db83f8158523e626ed560f50698181f51b1
parenta4917480cc989ce2cbaee79345149a7be22eccac (diff)
downloadwikitrans-8d24e13c1caddd6163972cb6bb7c58815346a202.tar.gz
wikitrans-8d24e13c1caddd6163972cb6bb7c58815346a202.tar.bz2
Fix parsing of closed tags with whitespace before '/>'
* WikiTrans/wikimarkup.py (BaseWikiMarkup.otag): Fix the P<args> named part so that it cannot start with a slash.
-rw-r--r--WikiTrans/wikimarkup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/WikiTrans/wikimarkup.py b/WikiTrans/wikimarkup.py
index 0987da2..6cbf5de 100644
--- a/WikiTrans/wikimarkup.py
+++ b/WikiTrans/wikimarkup.py
@@ -71,49 +71,49 @@ class TagAttributes(object):
raise TagAttributeSyntax(s)
def __len__(self):
return len(self.tab)
def __getitem__(self, key):
return self.tab[key]
def __contains__(self, key):
return key in self.tab
def __iter__(self):
for key in self.tab:
yield(key)
def has_key(self, key):
return self.__contains__(key)
def __setitem__(self, key, value):
self.tab[key] = value
def __delitem__(self, key):
del self.tab[key]
def __str__(self):
return self.printable
def __repr__(self):
return self.printable
class BaseWikiMarkup(object):
delim = re.compile("^==+[ \t]*|[ \t]*==+[ \t]*$|(^----$)|^\\*+|^#+|^[;:]+|(\\[\\[)|\\[|(\\{\\{)|(\\]\\])|\\]|(\\}\\})|\\||(\\'\\'\\'?)|<")
- otag = re.compile("<(?P<tag>[a-zA-Z0-9_]+)(?:\s+(?P<args>[^>]+))?\s*(?P<closed>/)?>")
+ otag = re.compile("<(?P<tag>[a-zA-Z0-9_]+)(?:\s+(?P<args>[^/][^>]+))?\s*(?P<closed>/)?>")
ctag = re.compile("</(?P<tag>[a-zA-Z0-9_]+)\s*>")
refstart = re.compile("^https?://")
close_delim = {
'[': ']',
'[[': ']]',
'{{': '}}'
}
# Environment types:
envtypes = { "*": [ "unnumbered", 0 ],
"#": [ "numbered", 0 ],
";": [ "defn", 0 ],
":": [ "defn", 1 ]
}
toklist = None
tokind = 0
newline = 0
tree = None
tags = [ 'code', 'nowiki', 'tt', 'div', 'ref', 'references' ]
debug_level = 0

Return to:

Send suggestions and report system problems to the System administrator.