diff options
Diffstat (limited to 'Lib/formatter.py')
| -rw-r--r-- | Lib/formatter.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Lib/formatter.py b/Lib/formatter.py index ccbbdf1..6ea5d9e 100644 --- a/Lib/formatter.py +++ b/Lib/formatter.py @@ -18,9 +18,7 @@ available mechanisms for setting the properties which formatter objects manage and inserting data into the output. """ -import string import sys -from types import StringType AS_IS = None @@ -119,7 +117,7 @@ class AbstractFormatter: self.writer.send_line_break() if not self.para_end: self.writer.send_paragraph((blankline and 1) or 0) - if type(format) is StringType: + if isinstance(format, str): self.writer.send_label_data(self.format_counter(format, counter)) else: self.writer.send_label_data(format) @@ -176,16 +174,13 @@ class AbstractFormatter: return label.upper() return label - def add_flowing_data(self, data, - # These are only here to load them into locals: - whitespace = string.whitespace, - join = string.join, split = string.split): + def add_flowing_data(self, data): if not data: return # The following looks a bit convoluted but is a great improvement over # data = regsub.gsub('[' + string.whitespace + ']+', ' ', data) - prespace = data[:1] in whitespace - postspace = data[-1:] in whitespace - data = join(split(data)) + prespace = data[:1].isspace() + postspace = data[-1:].isspace() + data = " ".join(data.split()) if self.nospace and not data: return elif prespace or self.softspace: @@ -411,7 +406,7 @@ class DumbWriter(NullWriter): def send_flowing_data(self, data): if not data: return - atbreak = self.atbreak or data[0] in string.whitespace + atbreak = self.atbreak or data[0].isspace() col = self.col maxcol = self.maxcol write = self.file.write @@ -427,7 +422,7 @@ class DumbWriter(NullWriter): col = col + len(word) atbreak = 1 self.col = col - self.atbreak = data[-1] in string.whitespace + self.atbreak = data[-1].isspace() def test(file = None): |