summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgbrandl <devnull@localhost>2006-12-20 21:21:37 +0100
committergbrandl <devnull@localhost>2006-12-20 21:21:37 +0100
commitbc6d85124f16c0e62c8fa1d2f3f117b929a6ff4a (patch)
tree8b6c87734f97826489a744b0b4c64b8080285361
parent1d634b6950bfac268f6d05a673fd48094738f01e (diff)
downloadpygments-bc6d85124f16c0e62c8fa1d2f3f117b929a6ff4a.tar.gz
[svn] Clarify docs and remove debugging code.
-rw-r--r--docs/src/formatters.txt5
-rw-r--r--pygments/formatters/rtf.py3
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/src/formatters.txt b/docs/src/formatters.txt
index b4d8dc65..4eb64e7d 100644
--- a/docs/src/formatters.txt
+++ b/docs/src/formatters.txt
@@ -24,6 +24,11 @@ All formatters support this option:
If this is ``""`` or ``None``, Unicode strings will be written
to the output file, which most file-like objects do not support.
+ For example, `pygments.highlight()` will return a Unicode string if
+ called with no `outfile` argument and a formatter that has `encoding`
+ set to ``None`` because it uses a `StringIO.StringIO` object that
+ supports Unicode arguments to `write()`. Using a regular file object
+ wouldn't work.
The `HtmlFormatter` and `LatexFormatter` classes support these options:
diff --git a/pygments/formatters/rtf.py b/pygments/formatters/rtf.py
index 1aa0b9b8..16a69ae2 100644
--- a/pygments/formatters/rtf.py
+++ b/pygments/formatters/rtf.py
@@ -69,9 +69,6 @@ class RtfFormatter(Formatter):
return text.replace('\n', '\\par\n')
def format(self, tokensource, outfile):
- if not self.encoding:
- outfile.write(u'')
-
outfile.write(r'{\rtf1\ansi\deff0'
r'{\fonttbl{\f0\fmodern\fprq1\fcharset0%s;}}{\colortbl;' %
(self.fontface and ' ' + self._escape(self.fontface) or ''))