Improve mechanisms of encoding

- we now let writers return already-encoded text, this helps in a few
  cases.

darcs-hash:20090707200621-82ea9-e012cd62add13db0c62016414585846a6ed817f7.gz

1 files changed, 3 insertions, 8 deletions

diff --git a/writers.py b/writers.py
index 31be343..3d7394a 100644
--- a/writers.py
+++ b/writers.py
@@ -140,7 +140,8 @@ class HTMLlog(_BaseWriter):
         # That's only right before the i/o functions in the Config
         # object.
         formatter = HtmlFormatter(lineanchors='l',
-                                  full=True, style=M.config.pygmentizeStyle)
+                                  full=True, style=M.config.pygmentizeStyle,
+                                  output_encoding=self.M.config.output_codec)
         Lexer = IrcLogsLexer
         Lexer.tokens['msg'][1:1] = \
            [ # match:   #topic commands
@@ -390,11 +391,5 @@ class HTMLfromReST(_BaseWriter):
         rstToHTML = docutils.core.publish_string(rst, writer_name='html',
                              settings_overrides={'file_insertion_enabled': 0,
                                                  'raw_enabled': 0,
-                                                 'output_encoding':'utf-8'})
-        # Unfortunantly, docutils forces us to encode to some charset.
-        # We have to return a utf-8 thing to be encoded later, so we
-        # hack decode here, only to be re-encoded later.  (I've dug
-        # into the docutils internals, it's not obvious that I could
-        # do this easily.)
-        rstToHTML = rstToHTML.decode('utf-8', 'replace')
+                                'output_encoding':self.M.config.output_codec})
         return rstToHTML