Merge pull request #1 from elacuesta/add_support_for_has_revert_xpath_translation_change

Revert xpath translation change to make it consistent

Author: annbgn

cssselect/xpath.py

@@ -403,7 +403,9 @@ def xpath_relation_child_combinator(self, left, right):
 
     def xpath_relation_direct_adjacent_combinator(self, left, right):
         """right is a sibling immediately after left; select left"""
-        xpath = left.add_condition("following-sibling::{}[position() = 1]".format(right.element))
+        xpath = left.add_condition(
+            "following-sibling::*[(name() = '{}') and (position() = 1)]".format(right.element)
+        )
         return xpath
 
     def xpath_relation_indirect_adjacent_combinator(self, left, right):

tests/test_cssselect.py

@@ -516,7 +516,7 @@ def xpath(css):
         assert xpath("e:has(~ f)") == "e[following-sibling::f]"
         assert (
             xpath("e:has(+ f)")
-            == "e[following-sibling::f[position() = 1]]"
+            == "e[following-sibling::*[(name() = 'f') and (position() = 1)]]"
         )
         assert xpath('e f') == (
             "e/descendant-or-self::*/f")