Another attempt at a fix for unittest.test.test_result for windows line endings
diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py
index 7a1f65a..c02b8ef 100644
--- a/Lib/unittest/test/test_result.py
+++ b/Lib/unittest/test/test_result.py
@@ -1,4 +1,3 @@
-import os
import sys
import textwrap
from cStringIO import StringIO, OutputType
@@ -414,8 +413,8 @@
print 'foo'
print >> sys.stderr, 'bar'
- self.assertEqual(out_stream.getvalue(), 'foo%s' % os.linesep)
- self.assertEqual(err_stream.getvalue(), 'bar%s' % os.linesep)
+ self.assertEqual(out_stream.getvalue(), 'foo\n')
+ self.assertEqual(err_stream.getvalue(), 'bar\n')
self.assertEqual(result._original_stdout.getvalue(), '')
self.assertEqual(result._original_stderr.getvalue(), '')
@@ -468,13 +467,13 @@
expectedOutMessage = textwrap.dedent("""
Stdout:
foo
- """).replace('\n', os.linesep)
+ """)
expectedErrMessage = ''
if include_error:
expectedErrMessage = textwrap.dedent("""
Stderr:
bar
- """).replace('\n', os.linesep)
+ """)
expectedFullMessage = 'None\n%s%s' % (expectedOutMessage, expectedErrMessage)
self.assertIs(test, self)