[pypy-svn] r14776 - pypy/dist/pypy/tool/pytest

[hpk at codespeak.net]

Author: hpk
Date: Tue Jul 19 17:09:57 2005
New Revision: 14776

Modified:
   pypy/dist/pypy/tool/pytest/result.py
Log:
default to utf8 encoding for mime messages


Modified: pypy/dist/pypy/tool/pytest/result.py
==============================================================================
--- pypy/dist/pypy/tool/pytest/result.py	(original)
+++ pypy/dist/pypy/tool/pytest/result.py	Tue Jul 19 17:09:57 2005
@@ -25,7 +25,7 @@
         return self._headers.items()
 
     def addnamedtext(self, name, text): 
-        assert isinstance(text, str)
+        assert isinstance(text, basestring)
         assert isinstance(name, str)
         self._blocknames.append(name) 
         self._blocks[name] = text 
@@ -104,7 +104,7 @@
                 assert submsg.get_main_type() == 'text'
                 fn = submsg.get_filename() 
                 assert fn
-                self.addnamedtext(fn, submsg.get_payload())
+                self.addnamedtext(fn, unicode(submsg.get_payload(), 'utf8'))
 
     def ismodifiedtest(self): 
         # XXX we need proper cross-platform paths!