fix review remarks

Author: annbgn

cssselect/parser.py

@@ -267,7 +267,10 @@ def __repr__(self):
         )
 
     def canonical(self):
-        subsel = self.subselector.canonical()
+        if not self.subselector:
+            subsel = '*'
+        else:
+            subsel = self.subselector[0].canonical()
         if len(subsel) > 1:
             subsel = subsel.lstrip("*")
         return "%s:has(%s)" % (self.selector.canonical(), subsel)

cssselect/xpath.py

@@ -388,11 +388,7 @@ def xpath_indirect_adjacent_combinator(self, left, right):
 
     def xpath_relation_descendant_combinator(self, left, right):
         """right is a child, grand-child or further descendant of left; select left"""
-        return left.join(
-            "/descendant-or-self::",
-            right,
-            closing_combiner="/ancestor-or-self::" + left.element,
-        )
+        return left.join("[descendant::", right, closing_combiner="]")
 
     def xpath_relation_child_combinator(self, left, right):
         """right is an immediate child of left; select left"""
@@ -411,11 +407,7 @@ def xpath_relation_direct_adjacent_combinator(self, left, right):
 
     def xpath_relation_indirect_adjacent_combinator(self, left, right):
         """right is a sibling after left, immediately or not; select left"""
-        return left.join(
-            "/following-sibling::",
-            right,
-            closing_combiner="/preceding-sibling::" + left.element,
-        )
+        return left.join("[following-sibling::", right, closing_combiner="]")
 
     # Function: dispatch by function/pseudo-class name
 

tests/test_cssselect.py

@@ -305,12 +305,8 @@ def css2css(css, res=None):
         css2css(':not(*[foo])', ':not([foo])')
         css2css(':not(:empty)')
         css2css(':not(#foo)')
-        # css2css(':has(*)')
-        # css2css(':has(foo)')
-        # css2css(':has(*.foo)', ':has(.foo)')
-        # css2css(':has(*[foo])', ':has([foo])')
-        # css2css(':has(:empty)')
-        # css2css(':has(#foo)')
+        css2css(':has(*)')
+        css2css(':has(foo)')
         css2css('foo:empty')
         css2css('foo::before')
         css2css('foo:empty::before')
@@ -504,8 +500,8 @@ def xpath(css):
         assert xpath('e:nOT(*)') == (
             "e[0]")  # never matches        
         assert xpath('e:has(> f)') == 'e[./f]'
-        assert xpath('e:has(f)') == 'e/descendant-or-self::f/ancestor-or-self::e'
-        assert xpath('e:has(~ f)') == 'e/following-sibling::f/preceding-sibling::e'
+        assert xpath('e:has(f)') == 'e[descendant::f]'
+        assert xpath('e:has(~ f)') == 'e[following-sibling::f]'
         assert xpath('e:has(+ f)') == "e/following-sibling::*[(name() = 'f') and (position() = 1)]/preceding-sibling::*[(name() = 'e') and (position() = 1)]"
         assert xpath('e f') == (
             "e/descendant-or-self::*/f")
@@ -878,9 +874,7 @@ def pcss(main, *selectors, **kwargs):
         assert pcss('ol :Not(li[class])') == [
             'first-li', 'second-li', 'li-div',
             'fifth-li', 'sixth-li', 'seventh-li']
-        # assert pcss('link:has(*)') == []
-        # assert pcss('link:has([href])') == ['link-href']
-        # assert pcss('ol:has(div)') == ['first-ol']
+        assert pcss('ol:has(div)') == ['first-ol']
         assert pcss('ol.a.b.c > li.c:nth-child(3)') == ['third-li']
 
         # Invalid characters in XPath element names, should not crash