Changeset 3933:84a390ea9119 in livinglogic.python.xist for src/ll/xist/scripts/dtd2xsc.py

Show
Ignore:
Timestamp:
02/27/10 18:14:19 (10 years ago)
Author:
Walter Doerwald <walter@…>
Parents:
3928:97eaeaf5656b (diff), 3932:515c28c99841 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Branch:
default
Message:

Merged in release 3.7.3.

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • src/ll/xist/scripts/dtd2xsc.py

    r3886 r3933  
    22# -*- coding: utf-8 -*- 
    33 
    4 ## Copyright 1999-2009 by LivingLogic AG, Bayreuth/Germany 
    5 ## Copyright 1999-2009 by Walter Dörwald 
     4## Copyright 1999-2010 by LivingLogic AG, Bayreuth/Germany 
     5## Copyright 1999-2010 by Walter Dörwald 
    66## 
    77## All Rights Reserved 
  • src/ll/xist/scripts/dtd2xsc.py

    r3930 r3933  
    152152    for entname in ents: 
    153153        if entname not in ("quot", "apos", "gt", "lt", "amp"): 
    154             ent = parsers.parsestring(dtd.resolve_ge(entname).value, parser=parsers.SGMLOPParser()) 
     154            ent = parsers.tree(dtd.resolve_ge(entname).value | parsers.Encoder("utf-8") | parsers.SGMLOP(encoding="utf-8") | parsers.Prefixes() | parsers.Instantiate()) 
    155155            ns.content.append(xnd.CharRef(entname, codepoint=ord(unicode(ent[0])[0]))) 
    156156