Update li handling a bit, and make the expected test results be what we'd

actually want (previous version might have been a bit of a work around)

diff --git a/rss2maildir.py b/rss2maildir.py
index 7acbe54966ae02ff2cfaaf7cd3d67bb49cb0eb09..3e4ed605d1eaa7669e1faccd25904449d2a6596b 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -227,7 +227,9 @@ class HTML2Text(HTMLParser):
         elif self.inpre:
             self.text = self.text + unicode(data, "utf-8")
         else:
         elif self.inpre:
             self.text = self.text + unicode(data, "utf-8")
         else:

-            self.text = self.text + unicode(data, "utf-8").strip() + u' '
+            isallwhitespace = data.strip()
+            if isallwhitespace != "" and self.text[-1] == "\n":
+                self.text = self.text + unicode(data, "utf-8").strip() + u' '

 
     def handle_entityref(self, name):
         entity = name
 
     def handle_entityref(self, name):
         entity = name

diff --git a/tests/expected/unorderedlist-wellformed.txt b/tests/expected/unorderedlist-wellformed.txt
index 6f37326a9661aa00b0a7fb6551a492691c99e6b3..02f68acc012d1f432de49b06c606a14ac507b80b 100644 (file)
--- a/tests/expected/unorderedlist-wellformed.txt
+++ b/tests/expected/unorderedlist-wellformed.txt
@@ -1,5 +1,4 @@
-This is a well formed unordered list. 
-  * The first item
-  * The second item
-  * The third item
-  
+This is a well formed unordered list.
+ * The first item
+ * The second item
+ * The third item