[SCM] morituri/master: handle encoding properly when outputting diff

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a2afe796441663c1b94dfdbd39e568a439ee5262
Author: Velo Superman <supermanvelo at gmail.com>
Date:   Sun Mar 3 14:19:23 2013 +0100

    handle encoding properly when outputting diff

diff --git a/morituri/test/common.py b/morituri/test/common.py
index d1aa8d7..97e716e 100644
--- a/morituri/test/common.py
+++ b/morituri/test/common.py
@@ -26,11 +26,13 @@ def _diff(old, new, desc):
 
     raise AssertionError(
         ("\nError while comparing strings:\n"
-         "%s") % (output, ))
+         "%s") % (output.encode('utf-8'), ))
 
 
 def diffStrings(orig, new, desc='input'):
 
+    assert type(orig) == type(new)
+
     def _tolines(s):
         return [line + '\n' for line in s.split('\n')]
 

-- 
morituri packaging