even better way to normalize spaces in add_flowing_data

diff --git a/Lib/formatter.py b/Lib/formatter.py
index 363222e2a608c303480b76057a2161fee0c43637..d1830e4c3dc1b0f05579b351c881979866fa2e4a 100644 (file)
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -110,26 +110,18 @@ class AbstractFormatter:
        if not data: return
        # The following looks a bit convoluted but is a great improvement over
        # data = regsub.gsub('[' + string.whitespace + ']+', ' ', data)
-       if data[0] in string.whitespace:
-           head = ' '
-       else:
-           head = ''
-       if data[-1] in string.whitespace:
-           tail = ' '
-       else:
-           tail = ''
-       data = head + string.join(string.split(data))
-       if data != ' ': data = data + tail
-       #
-       if self.nospace and data[0] == ' ':
-           data = data[1:]
+       prespace = data[0] in string.whitespace
+       postspace = data[-1] in string.whitespace
+       data = string.join(string.split(data))
+       if self.nospace and prespace:
            if not data: return
-       elif self.softspace and data[0] != ' ':
-           data = ' ' + data
+           prespace = 0
+       elif self.softspace:
+           prespace = 1
        self.nospace = self.softspace = 0
-       if data[-1] == ' ':
-           data = data[:-1]
+       if postspace:
            self.softspace = 1
+       if prespace: data = ' ' + data
        self.writer.send_flowing_data(data)
 
     def add_literal_data(self, data):