Changeset 2835:d8283a7b1920 in livinglogic.python.xist

Show
Ignore:
Timestamp:
08/01/07 12:54:17 (12 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Update asBytes() call in EXAMPLES.xml to use bytes().

Fix html.itercssrules._doimport(): If no media is specified on the stylesheet,
always use it.

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • EXAMPLES.xml

    r2708 r2835  
    2828) 
    2929 
    30 print node.conv().asBytes(encoding="us-ascii") 
     30print node.conv().bytes(encoding="us-ascii") 
    3131</prog> 
    3232 
     
    5454                +xsc.Text(".") 
    5555 
    56 print node.conv().asBytes(encoding="us-ascii") 
     56print node.conv().bytes(encoding="us-ascii") 
    5757</prog> 
    5858 
     
    9797) 
    9898 
    99 print node.conv().asBytes(encoding="us-ascii") 
     99print node.conv().bytes(encoding="us-ascii") 
    100100</prog> 
    101101 
     
    280280            +section(title="The Interactive Startup File") 
    281281 
    282 print document.conv().asBytes() 
     282print document.conv().bytes() 
    283283</prog> 
    284284 
  • src/ll/xist/ns/html.py

    r2834 r2835  
    13971397        self.media = media 
    13981398 
    1399  
    14001399    def _fixurl(self, rule, base): 
    14011400        if base is not None: 
     
    14121411    def _doimport(self, parentsheet, base): 
    14131412        media = self._getmedia(parentsheet) 
    1414         if self.media is None or self.media in media: 
     1413        if media is None or self.media is None or self.media in media: 
    14151414            for rule in parentsheet.cssRules: 
    14161415                if rule.type == css.CSSRule.IMPORT_RULE: