From d95474e060f25e3eb251bb77a21ab87e7f7b7d5b Mon Sep 17 00:00:00 2001
From: aarif <mraarif@outlook.com>
Date: Fri, 13 Sep 2019 16:05:53 +0500
Subject: [PATCH] python 3 fixes

further fixes
---
 common/djangoapps/util/tests/test_file.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/djangoapps/util/tests/test_file.py b/common/djangoapps/util/tests/test_file.py
index b4d62b66b1..55dd86c270 100644
--- a/common/djangoapps/util/tests/test_file.py
+++ b/common/djangoapps/util/tests/test_file.py
@@ -231,55 +231,56 @@ class TestUniversalNewlineIterator(TestCase):
     @ddt.data(1, 2, 999)
     def test_line_feeds(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'foo\nbar\n'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo\nbar\n'), buffer_size=buffer_size)],
             ['foo\n', 'bar\n']
         )
 
     @ddt.data(1, 2, 999)
     def test_carriage_returns(self, buffer_size):
+        import pdb; pdb.set_trace()
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'foo\rbar\r'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo\rbar\r'), buffer_size=buffer_size)],
             ['foo\n', 'bar\n']
         )
 
     @ddt.data(1, 2, 999)
     def test_carriage_returns_and_line_feeds(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'foo\r\nbar\r\n'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo\r\nbar\r\n'), buffer_size=buffer_size)],
             ['foo\n', 'bar\n']
         )
 
     @ddt.data(1, 2, 999)
     def test_no_trailing_newline(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'foo\nbar'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo\nbar'), buffer_size=buffer_size)],
             ['foo\n', 'bar']
         )
 
     @ddt.data(1, 2, 999)
     def test_only_one_line(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'foo\n'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo\n'), buffer_size=buffer_size)],
             ['foo\n']
         )
 
     @ddt.data(1, 2, 999)
     def test_only_one_line_no_trailing_newline(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'foo'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo'), buffer_size=buffer_size)],
             ['foo']
         )
 
     @ddt.data(1, 2, 999)
     def test_empty_file(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u''), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u''), buffer_size=buffer_size)],
             []
         )
 
     @ddt.data(1, 2, 999)
     def test_unicode_data(self, buffer_size):
         self.assertEqual(
-            [thing for thing in UniversalNewlineIterator(StringIO(u'héllø wo®ld'), buffer_size=buffer_size)],
+            [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'héllø wo®ld'), buffer_size=buffer_size)],
             [u'héllø wo®ld']
         )