Make RuleSet.selector and Declaration.value plain lists i.s.o ContainerToken

Author: SimonSapin

tinycss/css21.py

@@ -15,7 +15,6 @@
 
 from .decodingimportdecode
 from .tokenizerimporttokenize_grouped
-from .token_dataimportContainerToken
 
 
 # stylesheet : [ CDO | CDC | S | statement ]*;
@@ -145,8 +144,9 @@ class RuleSet(object):
 
  .. attribute:: selector
 
- The selecor as a :class:`~tinycss.token_data.ContainerToken` object.
- In CSS 3 terminology, this is actually a selector group.
+ The selector as a list of :class:`~.token_data.Token` or
+ :class:`~.token_data.ContainerToken`.
+ In CSS 3, this is actually called a selector group.
 
  .. attribute:: declarations
 
@@ -176,7 +176,8 @@ class Declaration(object):
 
  .. attribute:: value
 
- The property value as a :class:`~tinycss.token_data.ContainerToken`.
+ The property value as a list of :class:`~.token_data.Token` or
+ :class:`~.token_data.ContainerToken`.
 
  The value is not parsed. UAs using tinycss may only support
  some properties or some values and tinycss does not know which.
@@ -724,27 +725,23 @@ def parse_ruleset(self, first_token, tokens):
  not for CSS 2.1 or another level.
 
  """
-selector_parts= []
+selector= []
 fortokeninchain([first_token], tokens):
 iftoken.type=='{':
 # Parse/validate once we’ve read the whole rule
-whileselector_partsandselector_parts[-1].type=='S':
-selector_parts.pop()
-ifnotselector_parts:
+whileselectorandselector[-1].type=='S':
+selector.pop()
+ifnotselector:
 raiseParseError(first_token, 'empty selector')
-forselector_tokeninselector_parts:
+forselector_tokeninselector:
 self.validate_any(selector_token, 'selector')
-start=selector_parts[0] ifselector_partselsetoken
-selector=ContainerToken(
-'SELECTOR', '', '', selector_parts,
-start.line, start.column)
 declarations, errors=self.parse_declaration_list(
 token.content)
 ruleset=RuleSet(selector, declarations,
 first_token.line, first_token.column)
 returnruleset, errors
 else:
-selector_parts.append(token)
+selector.append(token)
 raiseParseError(token, 'no declaration block found for ruleset')
 
 defparse_declaration_list(self, tokens):
@@ -826,8 +823,6 @@ def parse_declaration(self, tokens):
 ifnotvalue:
 raiseParseError(token, 'expected a property value')
 value, priority=self.parse_value_priority(value)
-value=ContainerToken(
-'VALUES', '', '', value, value[0].line, value[0].column)
 returnDeclaration(
 property_name, value, priority, name_token.line, name_token.column)
 

tinycss/selectors3.py

@@ -212,9 +212,9 @@ def parse_ruleset(self, first_token, tokens):
 first_token, tokens)
 try:
 ruleset.selector_list=_parse_selector_group_tokens(
-ruleset.selector.content)
+ruleset.selector)
 exceptInvalidSelectorErrorasexc:
 # Invalidate the whole ruleset even if some selectors
 # in the selector group are valid.
-raiseParseError(ruleset.selector, exc.args[0])
+raiseParseError(ruleset, exc.args[0])
 returnruleset, errors

tinycss/tests/test_css21.py

@@ -154,8 +154,8 @@ def parse_at_rule(self, rule, stylesheet_rules, errors, context):
 list(jsonify(rule.body.content))
 ifrule.bodyisnotNoneelseNone)
 ifrule.at_keywordelse
- (rule.selector.as_css, [
- (decl.name, list(jsonify(decl.value.content)))
+ (''.join(s.as_cssforsinrule.selector), [
+ (decl.name, list(jsonify(decl.value)))
 fordeclinrule.declarations])
 forruleinstylesheet.rules
  ]
@@ -198,7 +198,7 @@ def parse_at_rule(self, rule, stylesheet_rules, errors, context):
 deftest_parse_style_attr(css_source, expected_declarations, expected_errors):
 declarations, errors=CSS21Parser().parse_style_attr(css_source)
 assert_errors(errors, expected_errors)
-result= [(decl.name, list(jsonify(decl.value.content)))
+result= [(decl.name, list(jsonify(decl.value)))
 fordeclindeclarations]
 assertresult==expected_declarations
 
@@ -231,7 +231,7 @@ def test_parse_style_attr(css_source, expected_declarations, expected_errors):
 deftest_important(css_source, expected_declarations, expected_errors):
 declarations, errors=CSS21Parser().parse_style_attr(css_source)
 assert_errors(errors, expected_errors)
-result= [(decl.name, list(jsonify(decl.value.content)), decl.priority)
+result= [(decl.name, list(jsonify(decl.value)), decl.priority)
 fordeclindeclarations]
 assertresult==expected_declarations
 
@@ -305,7 +305,7 @@ def test_at_page(css, expected_result, expected_errors):
 result= (
 rule.selector,
 rule.specificity,
- [(decl.name, list(jsonify(decl.value.content)))
+ [(decl.name, list(jsonify(decl.value)))
 fordeclinrule.declarations],
  )
 assertresult==expected_result
@@ -337,8 +337,8 @@ def test_at_media(css_source, expected_rules, expected_errors):
 assertrule.at_keyword=='@media'
 result= [
  (rule.media, [
- (sub_rule.selector.as_css, [
- (decl.name, list(jsonify(decl.value.content)))
+ (''.join(s.as_cssforsinsub_rule.selector), [
+ (decl.name, list(jsonify(decl.value)))
 fordeclinsub_rule.declarations])
 forsub_ruleinrule.rules
  ])

tinycss/tests/test_page3.py

@@ -88,7 +88,7 @@ def test_content(css, expected_declarations, expected_rules, expected_errors):
 assert_errors(stylesheet.errors, expected_errors)
 
 defdeclarations(rule):
-return [(decl.name, list(jsonify(decl.value.content)))
+return [(decl.name, list(jsonify(decl.value)))
 fordeclinrule.declarations]
 
 assertlen(stylesheet.rules) ==1