[pypy-svn] r72526 - in pypy/trunk/py: impl/code plugin

[arigo at codespeak.net]

Author: arigo
Date: Mon Mar 22 11:53:08 2010
New Revision: 72526

Modified:
   pypy/trunk/py/impl/code/code.py
   pypy/trunk/py/plugin/pytest_resultlog.py
Log:
Revert r72487, which had no effect, and apply instead encode()
somewhere else...


Modified: pypy/trunk/py/impl/code/code.py
==============================================================================
--- pypy/trunk/py/impl/code/code.py	(original)
+++ pypy/trunk/py/impl/code/code.py	Mon Mar 22 11:53:08 2010
@@ -579,7 +579,7 @@
     def __str__(self):
         tw = py.io.TerminalWriter(stringio=True)
         self.toterminal(tw)
-        return tw.stringio.getvalue().strip()
+        return tw.stringio.getvalue().strip().encode('utf-8')
 
     def __repr__(self):
         return "<%s instance at %0x>" %(self.__class__, id(self))

Modified: pypy/trunk/py/plugin/pytest_resultlog.py
==============================================================================
--- pypy/trunk/py/plugin/pytest_resultlog.py	(original)
+++ pypy/trunk/py/plugin/pytest_resultlog.py	Mon Mar 22 11:53:08 2010
@@ -68,15 +68,15 @@
         else:
             code = report.shortrepr
         if code == 'x':
-            longrepr = safestr(report.longrepr)
+            longrepr = str(report.longrepr)
         elif code == 'P':
             longrepr = ''
         elif report.passed:
             longrepr = ""
         elif report.failed:
-            longrepr = safestr(report.longrepr) 
+            longrepr = str(report.longrepr) 
         elif report.skipped:
-            longrepr = safestr(report.longrepr.reprcrash.message)
+            longrepr = str(report.longrepr.reprcrash.message)
         self.log_outcome(report.item, code, longrepr) 
 
     def pytest_collectreport(self, report):
@@ -86,16 +86,9 @@
             else:
                 assert report.skipped
                 code = "S"
-            longrepr = safestr(report.longrepr.reprcrash)
+            longrepr = str(report.longrepr.reprcrash)
             self.log_outcome(report.collector, code, longrepr)    
 
     def pytest_internalerror(self, excrepr):
         path = excrepr.reprcrash.path 
-        self.write_log_entry(path, '!', safestr(excrepr))
-
-
-def safestr(x):
-    if isinstance(x, unicode):
-        return x.encode('utf-8')
-    else:
-        return str(x)
+        self.write_log_entry(path, '!', str(excrepr))