0
@@ -42,7 +42,7 @@ class DocParser(object):
0
f=open(os.path.join(path, file))
0
#adding a return to the beginning of the line allows for:
0
- # MOVED to the fil
marker
0
+ # MOVED to the fil
e marker
0
# fileStr = StringIO("\n%s" % f.read()).getvalue()
0
fileStr = StringIO("%s" % f.read()).getvalue()
0
log.info("parsing " + file)
0
@@ -313,9 +313,9 @@ class DocParser(object):
0
- type, description = "",
unicode(match.group(4) + match.group(5), 'utf-8', 'xmlcharrefreplace')
0
+ type, description = "",
match.group(4) + match.group(5)
0
- type, description =
unicode(match.group(2), 'utf-8', 'xmlcharrefreplace'), unicode((match.group(1) + match.group(3)).strip(), 'utf-8', 'xmlcharrefreplace')
0
+ type, description =
match.group(2), (match.group(1) + match.group(3)).strip()
0
type, description = "", ""
0
@@ -356,9 +356,9 @@ class DocParser(object):
0
- type, description = "",
unicode(match.group(4) + match.group(5), 'utf-8', 'xmlcharrefreplace')
0
+ type, description = "",
match.group(4) + match.group(5)
0
- type, description =
unicode(match.group(2), 'utf-8', 'xmlcharrefreplace'), unicode((match.group(1) + match.group(3)).strip(), 'utf-8', 'xmlcharrefreplace')
0
+ type, description =
match.group(2), (match.group(1) + match.group(3)).strip()
0
type, description = "", ""
0
@@ -436,8 +436,8 @@ it was empty" % token
0
if token and DESCRIPTION not in tokenMap:
0
- token = unicode(token, 'utf-8', 'xmlcharrefreplace')
0
- # token.encode('utf-8', 'xmlcharrefreplace')
0
+ # token = unicode(token, 'utf-8', 'xmlcharrefreplace')
0
+ ############################ token.encode('utf-8', 'xmlcharrefreplace')
0
tokenMap[DESCRIPTION] = [token]
0
else: pass # I don't think this can happen any longer
0
@@ -541,7 +541,7 @@ it was empty" % token
0
return target, tokenMap
0
-
print "DAV: %s" % tokenMap
0
+
# print "DAV: %s" % tokenMap
0
if FILE_MARKER in tokenMap:
0
if not FILE_MAP in self.data: self.data[FILE_MAP] = {}
0
self.currentFile = desc