Ticket #5965: runner_port3.patch

twisted/trial/runner.py

@@ -8 +8 @@
 Maintainer: Jonathan Lange
 """
 
+from __future__ import print_function,division,absolute_import
+from twisted.python.compat import _PY3
+
 __all__ = [
     'TestSuite',
 
@@ -33 +36 @@
 # These are imported so that they remain in the public API for t.trial.runner
 from twisted.trial.unittest import TestSuite
 
-from zope.interface import implements
+from zope.interface import implementer
 
 pyunit = __import__('unittest')
 
@@ -252 +255 @@
 
 
 
+@implementer(ITestCase)
 class TestHolder(object):
     """
     Placeholder for a L{TestCase} inside a reporter. As far as a L{TestResult}
     is concerned, this looks exactly like a unit test.
     """
 
-    implements(ITestCase)
-
     failureException = None
 
     def __init__(self, description):
@@ -652 +654 @@
     def _setUpTestdir(self):
         self._tearDownLogFile()
         currentDir = os.getcwd()
-        base = filepath.FilePath(self.workingDirectory)
+        base = filepath.FilePath(self.workingDirectory.encode('utf-8'))
         testdir, self._testDirLock = util._unusedTestDirectory(base)
         os.chdir(testdir.path)
         return currentDir
@@ -715 +717 @@
         if self.logfile == '-':
             logFile = sys.stdout
         else:
-            logFile = file(self.logfile, 'a')
+            logFile = open(self.logfile, 'a')
         self._logFileObject = logFile
         self._logFileObserver = log.FileLogObserver(logFile)
         log.startLoggingWithObserver(self._logFileObserver.emit, 0)