From d95474e060f25e3eb251bb77a21ab87e7f7b7d5b Mon Sep 17 00:00:00 2001 From: aarif Date: Fri, 13 Sep 2019 16:05:53 +0500 Subject: [PATCH 1/4] 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'] ) From 602b6d4607f6f9c1998ccc0ac1bbb25a5c19ffa9 Mon Sep 17 00:00:00 2001 From: aarif Date: Mon, 16 Sep 2019 15:59:02 +0500 Subject: [PATCH 2/4] minor fixes --- common/djangoapps/util/tests/test_file.py | 1 - 1 file changed, 1 deletion(-) diff --git a/common/djangoapps/util/tests/test_file.py b/common/djangoapps/util/tests/test_file.py index 55dd86c270..e407bb95aa 100644 --- a/common/djangoapps/util/tests/test_file.py +++ b/common/djangoapps/util/tests/test_file.py @@ -237,7 +237,6 @@ class TestUniversalNewlineIterator(TestCase): @ddt.data(1, 2, 999) def test_carriage_returns(self, buffer_size): - import pdb; pdb.set_trace() self.assertEqual( [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'foo\rbar\r'), buffer_size=buffer_size)], ['foo\n', 'bar\n'] From 38ad965c2e3b325eaea45711b930a57428336e5f Mon Sep 17 00:00:00 2001 From: aarif Date: Mon, 16 Sep 2019 16:36:12 +0500 Subject: [PATCH 3/4] test fixes --- common/djangoapps/util/tests/test_file.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/djangoapps/util/tests/test_file.py b/common/djangoapps/util/tests/test_file.py index e407bb95aa..28a042a815 100644 --- a/common/djangoapps/util/tests/test_file.py +++ b/common/djangoapps/util/tests/test_file.py @@ -9,6 +9,7 @@ from datetime import datetime from io import StringIO import ddt +import six from django.core import exceptions from django.core.files.uploadedfile import SimpleUploadedFile from django.http import HttpRequest @@ -279,7 +280,5 @@ class TestUniversalNewlineIterator(TestCase): @ddt.data(1, 2, 999) def test_unicode_data(self, buffer_size): - self.assertEqual( - [thing.decode('utf-8') for thing in UniversalNewlineIterator(StringIO(u'héllø wo®ld'), buffer_size=buffer_size)], - [u'héllø wo®ld'] - ) + self.assertEqual([thing.decode('utf-8') if six.PY3 else thing for thing in + UniversalNewlineIterator(StringIO(u'héllø wo®ld'),buffer_size=buffer_size)],[u'héllø wo®ld']) From e791325f6c22f7a5788b14ce33ff3594ee28dc35 Mon Sep 17 00:00:00 2001 From: aarif Date: Mon, 16 Sep 2019 17:02:33 +0500 Subject: [PATCH 4/4] quality fixes --- common/djangoapps/util/tests/test_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/djangoapps/util/tests/test_file.py b/common/djangoapps/util/tests/test_file.py index 28a042a815..bca74aacee 100644 --- a/common/djangoapps/util/tests/test_file.py +++ b/common/djangoapps/util/tests/test_file.py @@ -281,4 +281,4 @@ class TestUniversalNewlineIterator(TestCase): @ddt.data(1, 2, 999) def test_unicode_data(self, buffer_size): self.assertEqual([thing.decode('utf-8') if six.PY3 else thing for thing in - UniversalNewlineIterator(StringIO(u'héllø wo®ld'),buffer_size=buffer_size)],[u'héllø wo®ld']) + UniversalNewlineIterator(StringIO(u'héllø wo®ld'), buffer_size=buffer_size)], [u'héllø wo®ld'])