Merge lp:~mjumbewu/beautifulsoup/text-white-space-fix into lp:beautifulsoup/3.2

[Mjumbe Wawatu Ukweli]

BeautifulSoup removes too much white space on getText. For example, the text of "<p>This is a <i>test</i>, ok?" should be "This is a test, ok?". Instead, BS calculates it as "This is atest, ok?"

This invalidates bug #788986

[Leonard Richardson (leonardr)]

Bug 788986 was fixed another way.

review: Disapprove

Unmerged revisions

45. By Mjumbe Wawatu Ukweli on 2011-05-27

In getText, multiple white space characters get truncated to one.

44. By Mjumbe Wawatu Ukweli on 2011-05-25

Preserve spacing when using getText.

=== modified file 'BeautifulSoup.py'
--- BeautifulSoup.py	2010-11-21 13:35:35 +0000
+++ BeautifulSoup.py	2011-05-27 08:49:28 +0000
@@ -569,9 +569,10 @@
         current = self.contents[0]
         while current is not stopNode:
             if isinstance(current, NavigableString):
-                strings.append(current.strip())
+                strings.append(current)
             current = current.next
-        return separator.join(strings)
+        result = separator.join(strings)
+        return re.sub(r'\s+', ' ', result)
 
     text = property(getText)
 

=== added file 'BeautifulSoup.pyc'
Binary files BeautifulSoup.pyc	1970-01-01 00:00:00 +0000 and BeautifulSoup.pyc	2011-05-27 08:49:28 +0000 differ
=== modified file 'BeautifulSoupTests.py'
--- BeautifulSoupTests.py	2010-11-21 13:25:36 +0000
+++ BeautifulSoupTests.py	2011-05-27 08:49:28 +0000
@@ -220,6 +220,16 @@
         soup = BeautifulSoup("<ul><li>spam</li><li>eggs</li><li>cheese</li>")
         self.assertEquals(soup.ul.text, "spameggscheese")
         self.assertEquals(soup.ul.getText('/'), "spam/eggs/cheese")
+    
+    def testTextHasCorrectSpacing(self):
+        soup = BeautifulSoup("<p>This is a <i>test</i>.")
+        self.assertEquals(soup.text, "This is a test.")
+        self.assertEquals(soup.getText('/'), "This is a /test/.")
+    
+    def testMultipleSpacesBecomeOne(self):
+        soup = BeautifulSoup("<p>This    is a \n\n<i>test</i>.")
+        self.assertEquals(soup.text, "This is a test.")
+        self.assertEquals(soup.getText('/'), "This is a /test/.")
 
 class ThatsMyLimit(SoupTest):
     "Tests the limit argument."