From 34d1928766bcae11d8f679a6bf361d9210b6429e Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 9 Aug 2007 01:03:29 +0000 Subject: SF patch# 1770008 by Christian Heimes (plus some extras). Completely get rid of StringIO.py and cStringIO.c. I had to fix a few tests and modules beyond what Christian did, and invent a few conventions. E.g. in elementtree, I chose to write/return Unicode strings whe no encoding is given, but bytes when an explicit encoding is given. Also mimetools was made to always assume binary files. --- Lib/pydoc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Lib/pydoc.py') diff --git a/Lib/pydoc.py b/Lib/pydoc.py index f8fafa34e9..eea9853ad6 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1804,8 +1804,8 @@ running "hh -decompile . PythonNN.chm" in the C:\PythonNN\Doc> directory. document = re.sub(addrpat, '', re.sub(divpat, '', file.read())) file.close() - import htmllib, formatter, StringIO - buffer = StringIO.StringIO() + import htmllib, formatter, io + buffer = io.StringIO() parser = htmllib.HTMLParser( formatter.AbstractFormatter(formatter.DumbWriter(buffer))) parser.start_table = parser.do_p @@ -1816,7 +1816,7 @@ running "hh -decompile . PythonNN.chm" in the C:\PythonNN\Doc> directory. buffer = replace(buffer.getvalue(), '\xa0', ' ', '\n', '\n ') pager(' ' + buffer.strip() + '\n') if xrefs: - buffer = StringIO.StringIO() + buffer = io.StringIO() formatter.DumbWriter(buffer).send_flowing_data( 'Related help topics: ' + ', '.join(xrefs.split()) + '\n') self.output.write('\n%s\n' % buffer.getvalue()) @@ -1900,9 +1900,9 @@ class ModuleScanner: else: loader = importer.find_module(modname) if hasattr(loader,'get_source'): - import StringIO + import io desc = source_synopsis( - StringIO.StringIO(loader.get_source(modname)) + io.StringIO(loader.get_source(modname)) ) or '' if hasattr(loader,'get_filename'): path = loader.get_filename(modname) -- cgit v1.2.1