diff options
| author | Georg Brandl <georg@python.org> | 2014-10-08 09:21:15 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-08 09:21:15 +0200 |
| commit | 444fb6fd9b3492040a36fcca672fee8175f8d603 (patch) | |
| tree | 2bd411ca78decf276b95dc6b1788e594b2e35287 /pygments/formatters/other.py | |
| parent | 491fec23ef01687906f5d71ee718522cd2917926 (diff) | |
| parent | c1bfe4eed3805d3556bffa3c6b9cc2d3f6976205 (diff) | |
| download | pygments-444fb6fd9b3492040a36fcca672fee8175f8d603.tar.gz | |
Merged in leodemoura/pygments-main (pull request #399)
Diffstat (limited to 'pygments/formatters/other.py')
| -rw-r--r-- | pygments/formatters/other.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pygments/formatters/other.py b/pygments/formatters/other.py index c8269b19..d8e5f4f7 100644 --- a/pygments/formatters/other.py +++ b/pygments/formatters/other.py @@ -62,9 +62,8 @@ class RawTokenFormatter(Formatter): def __init__(self, **options): Formatter.__init__(self, **options) - if self.encoding: - raise OptionError('the raw formatter does not support the ' - 'encoding option') + # We ignore self.encoding if it is set, since it gets set for lexer + # and formatter if given with -Oencoding on the command line. self.encoding = 'ascii' # let pygments.format() do the right thing self.compress = get_choice_opt(options, 'compress', ['', 'none', 'gz', 'bz2'], '') |