Changeset 2890:8c73693e4301 in livinglogic.python.xist

Show
Ignore:
Timestamp:
08/18/07 16:42:40 (12 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Fix imports. Partially fixes tests.

Remove obsolete import of cssparsers.
User css module instead where appropriate.
There are still two spots in the test that fail,
because cssutils serialization format is slightly different
from the old one.

Files:
3 modified

Legend:

Unmodified
Added
Removed
  • src/ll/xist/parsers.py

    r2802 r2890  
    2525 
    2626from ll import url 
    27 from ll.xist import xsc, utils, cssparsers, sgmlop 
     27from ll.xist import xsc, utils, sgmlop 
    2828from ll.xist.ns import html 
    2929 
  • src/ll/xist/xsc.py

    r2883 r2890  
    21102110 
    21112111    def _transform(self, replacer): 
     2112        from ll.xist import css 
    21122113        style = cssutils.parseString(u"a{%s}" % self).cssRules[0].style 
    21132114        css.replaceurl(style, replacer) 
    2114         return self.serializer.do_css_CSSStyleDeclaration(style) 
     2115        return self.serializer.do_css_CSSStyleDeclaration(style).strip() 
    21152116 
    21162117    def parsed(self, parser, start=None): 
     
    33683369 
    33693370 
    3370 import publishers, cssparsers, converters, utils, helpers 
     3371import publishers, converters, utils, helpers 
    33713372 
    33723373 
  • test/test_xist.py

    r2783 r2890  
    1919 
    2020from ll import url 
    21 from ll.xist import xsc, parsers, cssparsers, presenters, converters, helpers, options, sims, xnd, xfind 
     21from ll.xist import xsc, parsers, css, presenters, converters, helpers, options, sims, xnd, xfind 
    2222from ll.xist.ns import wml, ihtml, html, chars, abbr, specials, htmlspecials, meta, form, php, xml, tld, docbook 
    2323