[svn r3852] r4545@delle: sbehnel | 2008-06-22 10:55:55 +0200

 fix: cssselect parser skipped remaining expression after parsing function with parameters

--HG--
branch : trunk

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lxml/cssselect.py b/src/lxml/cssselect.py
index 9e57843a..aba2b846 100644
--- a/src/lxml/cssselect.py
+++ b/src/lxml/cssselect.py
@@ -657,9 +657,9 @@ def parse_selector(stream):
     result = parse_simple_selector(stream)
     while 1:
         peek = stream.peek()
-        if peek == ',' or peek == ')' or peek is None:
+        if peek == ',' or peek is None:
             return result
-        if stream.peek() in ('+', '>', '~'):
+        elif peek in ('+', '>', '~'):
             # A combinator
             combinator = stream.next()
         else:
@@ -728,11 +728,11 @@ def parse_simple_selector(stream):
                 else:
                     # FIXME: parse_simple_selector, or selector, or...?
                     selector = parse_simple_selector(stream)
-                    next = stream.next()
-                    if not next == ')':
-                        raise SelectorSyntaxError(
-                            "Expected ), got %r and %r"
-                            % (next, selector))
+                next = stream.next()
+                if not next == ')':
+                    raise SelectorSyntaxError(
+                        "Expected ), got %r and %r"
+                        % (next, selector))
                 result = Function(result, type, ident, selector)
             else:
                 result = Pseudo(result, type, ident)