summaryrefslogtreecommitdiffstats
path: root/Lib/optparse.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-09 01:03:29 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-09 01:03:29 (GMT)
commit34d1928766bcae11d8f679a6bf361d9210b6429e (patch)
tree0b3d5842a690f811fa03f3b52420bbab9f0f5524 /Lib/optparse.py
parent918f49e645474382251bfddbb0a2e030051083ef (diff)
downloadcpython-34d1928766bcae11d8f679a6bf361d9210b6429e.zip
cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.tar.gz
cpython-34d1928766bcae11d8f679a6bf361d9210b6429e.tar.bz2
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.
Diffstat (limited to 'Lib/optparse.py')
-rw-r--r--Lib/optparse.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/Lib/optparse.py b/Lib/optparse.py
index e648a28..84a6abd 100644
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -1621,13 +1621,6 @@ class OptionParser (OptionContainer):
result.append(self.format_epilog(formatter))
return "".join(result)
- # used by test suite
- def _get_encoding(self, file):
- encoding = getattr(file, "encoding", None)
- if not encoding:
- encoding = sys.getdefaultencoding()
- return encoding
-
def print_help(self, file=None):
"""print_help(file : file = stdout)
@@ -1636,8 +1629,7 @@ class OptionParser (OptionContainer):
"""
if file is None:
file = sys.stdout
- encoding = self._get_encoding(file)
- file.write(self.format_help().encode(encoding, "replace"))
+ file.write(self.format_help())
# class OptionParser