Also override hooke.util.encoding.get_encoding in test/unicode_output.py

diff --git a/test/unicode_output.py b/test/unicode_output.py
index 0e37e975e726968a4e5dfc0f58651e27e1bef937..39ed7b0498a891b997fc9a637c5cb87bc5a92794 100644 (file)
--- a/test/unicode_output.py
+++ b/test/unicode_output.py
@@ -32,8 +32,11 @@ Command: flat_filter_playlist...
 import sys
 reload(sys)
 sys.setdefaultencoding('utf-8')
+import hooke.util.encoding
+hooke.util.encoding.get_encoding = lambda : 'utf-8'
 
-# setdefaultencoding to work around doctest/unicode limitations:
+# Override defaultencoding and get_encoding to work around
+# doctest/unicode limitations:
 #   Doctest: test.unicode_output
 #   ... /usr/lib/python2.6/doctest.py:1475: UnicodeWarning: Unicode
 #   equal comparison failed to convert both arguments to Unicode -
@@ -43,6 +46,6 @@ sys.setdefaultencoding('utf-8')
 #   http://stackoverflow.com/questions/1733414/how-do-i-include-unicode-strings-in-python-doctests
 # for details.
 #
-# Unfortunately, the setdefaultencoding also makes the
-# codecs.getwriter() code that this test is supposed to check a no-op.
-# Ah well, guess this will have to wait for Python 3.
+# Unfortunately, the override also makes the codecs.getwriter() code
+# that this test is supposed to check a no-op.  Ah well, guess this
+# will have to wait for Python 3.