Used name2codepoint directly; recode it.

git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@184 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index 57f64985a58d5a096bc604acc37f2dbb9975a70b..680ad5573a741bb99402449a77d969202e49abde 100755 (executable)
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -24,7 +24,7 @@ parsers.append(parse_html)
 
 
 import re
-from htmlentitydefs import entitydefs
+from htmlentitydefs import name2codepoint
 
 entity_re = re.compile("(&\w+;)")
 num_entity_re = re.compile("(&#[0-9]+;)")
@@ -34,19 +34,20 @@ def recode_entities(title, charset):
    for part in entity_re.split(title):
       if part not in ("&", "<", ">", "&quote;", " ") and \
             entity_re.match(part):
-         part = entitydefs.get(part[1:-1], part)
+         part = unichr(name2codepoint.get(part[1:-1], part)).encode(charset)
       output.append(part)
+   title = ''.join(output)
 
-   output2 = []
-   for part in num_entity_re.split(''.join(output)):
+   output = []
+   for part in num_entity_re.split(title):
       if num_entity_re.match(part):
          try:
             part = unichr(int(part[2:-1])).encode(charset)
          except UnicodeEncodeError:
             pass # Leave the entity as is
-      output2.append(part)
+      output.append(part)
 
-   return ''.join(output2)
+   return ''.join(output)
 
 
 def parse_html(filename, charset=None, log=None):