Merge lp:~gz/pyjunitxml/source_compat_python_3 into lp:pyjunitxml

[Martin Packman]

Branch to restore Python 3 compatibility. In doing so, needed to back out Vincent's addition of an encode call, but as this was breaking on babune anyway in some circumstances we want a proper fix there anyway (bug 625589 I'll get you soon...) Also does Python 3 style stripping of module name from front of builtin exceptions, as they all moved from 'exceptions' to 'builtins' and that was making the tests cry.

[Robert Collins (lifeless)]

Please be editing NEWS.

=== modified file 'junitxml/__init__.py'
--- junitxml/__init__.py	2010-01-12 10:26:29 +0000
+++ junitxml/__init__.py	2010-08-29 21:57:42 +0000
@@ -39,6 +39,12 @@
         return None
 
 
+def _error_name(eclass):
+    module = eclass.__module__
+    if module not in ("__main__", "builtins", "exceptions"):
+        return ".".join([module, eclass.__name__])
+    return eclass.__name__
+
 
 class JUnitXmlResult(unittest.TestResult):
     """A TestResult which outputs JUnit compatible XML."""
@@ -89,7 +95,6 @@
             delta = self._now() - from_datetime
         except TypeError:
             n = self._now()
-            print n, self._set_time, from_datetime
             delta = datetime.timedelta(-1)
         seconds = delta.days * 3600*24 + delta.seconds
         return seconds + 0.000001 * delta.microseconds
@@ -116,20 +121,20 @@
         self._stream.write('<testsuite errors="%d" failures="%d" name="" '
             'tests="%d" time="%0.3f">\n' % (len(self.errors),
             len(self.failures), self.testsRun, duration))
-        self._stream.write((''.join(self._results)).encode('utf8'))
+        self._stream.write(''.join(self._results))
         self._stream.write('</testsuite>\n')
 
     def addError(self, test, error):
         self.__super.addError(test, error)
         self._test_case_string(test)
         self._results.append('>\n')
-        self._results.append('<error type="%s.%s">%s</error>\n</testcase>\n'% (escape(error[0].__module__), escape(error[0].__name__), escape(self._exc_info_to_string(error, test))))
+        self._results.append('<error type="%s">%s</error>\n</testcase>\n'% (escape(_error_name(error[0])), escape(self._exc_info_to_string(error, test))))
 
     def addFailure(self, test, error):
         self.__super.addFailure(test, error)
         self._test_case_string(test)
         self._results.append('>\n')
-        self._results.append('<failure type="%s.%s">%s</failure>\n</testcase>\n'% (escape(error[0].__module__), escape(error[0].__name__), escape(self._exc_info_to_string(error, test))))
+        self._results.append('<failure type="%s">%s</failure>\n</testcase>\n'% (escape(_error_name(error[0])), escape(self._exc_info_to_string(error, test))))
 
     def addSuccess(self, test):
         self.__super.addSuccess(test)

=== modified file 'junitxml/tests/test_junitxml.py'
--- junitxml/tests/test_junitxml.py	2009-12-12 06:42:03 +0000
+++ junitxml/tests/test_junitxml.py	2010-08-29 21:57:42 +0000
@@ -5,7 +5,10 @@
 #  Copying permitted under the LGPL-3 licence, included with this library.
 
 
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
 import datetime
 import re
 import unittest
@@ -96,7 +99,7 @@
         self.result.stopTestRun()
         self.assertEqual("""<testsuite errors="1" failures="0" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Errors" name="test_me" time="0.000">
-<error type="exceptions.ZeroDivisionError">error</error>
+<error type="ZeroDivisionError">error</error>
 </testcase>
 </testsuite>
 """, self.get_output())
@@ -110,7 +113,7 @@
         self.result.stopTestRun()
         self.assertEqual("""<testsuite errors="0" failures="1" name="" tests="1" time="0.000">
 <testcase classname="junitxml.tests.test_junitxml.Fails" name="test_me" time="0.000">
-<failure type="exceptions.AssertionError">failure</failure>
+<failure type="AssertionError">failure</failure>
 </testcase>
 </testsuite>
 """, self.get_output())