Merge pull request scrapy#20 from sjp/master

Have :empty not match whitespace-only elements.

Author: SimonSapin

cssselect/tests.py

@@ -344,9 +344,9 @@ def xpath(css):
         assert xpath('e:only-of-type') == (
             "e[last() = 1]")
         assert xpath('e:empty') == (
-            "e[not(*) and not(normalize-space())]")
+            "e[not(*) and not(string-length())]")
         assert xpath('e:EmPTY') == (
-            "e[not(*) and not(normalize-space())]")
+            "e[not(*) and not(string-length())]")
         assert xpath('e:root') == (
             "e[not(parent::*)]")
         assert xpath('e:hover') == (
@@ -575,7 +575,7 @@ def pcss(main, *selectors, **kwargs):
         assert pcss('p:only-of-type') == ['paragraph']
         assert pcss('a:empty', 'a:EMpty') == ['name-anchor']
         assert pcss('li:empty') == [
-            'third-li', 'fourth-li', 'fifth-li', 'sixth-li', 'seventh-li']
+            'third-li', 'fourth-li', 'fifth-li', 'sixth-li']
         assert pcss(':root', 'html:root') == ['html']
         assert pcss('li:root', '* :root') == []
         assert pcss('*:contains("link")', ':CONtains("link")') == [

cssselect/xpath.py

@@ -454,7 +454,7 @@ def xpath_only_of_type_pseudo(self, xpath):
         return xpath.add_condition('last() = 1')
 
     def xpath_empty_pseudo(self, xpath):
-        return xpath.add_condition("not(*) and not(normalize-space())")
+        return xpath.add_condition("not(*) and not(string-length())")
 
     def pseudo_never_matches(self, xpath):
         """Common implementation for pseudo-classes that never match."""