File size: 8,145 Bytes
5980447 |
1 2 |
{"repo": "praekeltfoundation/molo", "pull_number": 517, "instance_id": "praekeltfoundation__molo-517", "issue_numbers": "", "base_commit": "ed7643420d31cdd8cd4ac2faab18d01abdef63d3", "patch": "diff --git a/molo/core/api/importers.py b/molo/core/api/importers.py\n--- a/molo/core/api/importers.py\n+++ b/molo/core/api/importers.py\n@@ -527,7 +527,7 @@ def import_image(self, image_id):\n \"local_version_existed\": True,\n \"file_url\": file_url,\n \"image_detail_url\": image_detail_url,\n- \"foreign_title\": img_info[\"title\"].encode('utf-8'),\n+ \"foreign_title\": img_info[\"title\"],\n }\n # update record keeper\n if self.record_keeper:\n@@ -538,7 +538,7 @@ def import_image(self, image_id):\n else:\n new_image, context = self.fetch_and_create_image(\n file_url,\n- img_info[\"title\"].encode('utf-8'))\n+ img_info[\"title\"])\n # update record keeper\n if self.record_keeper:\n self.record_keeper.record_image_relation(\n@@ -883,19 +883,6 @@ def copy_page_and_children(self, foreign_id, parent_id, depth=0):\n self.log(WARNING, message, e.message.pop(\"message\"), depth)\n return None\n \n- '''\n- except Exception as e:\n- context = {\n- \"exception\": e,\n- \"url\": url,\n- \"parent title\": parent.title,\n- \"foreign_page\": content[\"title\"].encode('utf-8'),\n- }\n- self.log(\n- ERROR, \"Create Page - abandon page and children creation\",\n- context, depth)\n- '''\n-\n if page:\n # create translations\n if content[\"meta\"][\"translations\"]:\ndiff --git a/molo/profiles/admin.py b/molo/profiles/admin.py\n--- a/molo/profiles/admin.py\n+++ b/molo/profiles/admin.py\n@@ -1,4 +1,4 @@\n-import csv\n+import unicodecsv as csv\n \n from django.contrib import admin\n from django.http import HttpResponse\n@@ -32,17 +32,14 @@\n \n \n def download_as_csv(ProfileUserAdmin, request, queryset):\n- response = HttpResponse(content_type='text/csv')\n+ response = HttpResponse(content_type='text/csv', charset='utf-8')\n response['Content-Disposition'] = 'attachment;filename=export.csv'\n- writer = csv.writer(response)\n+ writer = csv.writer(response, encoding='utf-8')\n user_model_fields = UserAdmin.list_display + ('date_joined', )\n profile_fields = ('alias', 'mobile_number')\n field_names = user_model_fields + profile_fields\n writer.writerow(field_names)\n for obj in queryset:\n- if obj.profile.alias:\n- obj.profile.alias = obj.profile.alias.encode('utf-8')\n- obj.username = obj.username.encode('utf-8')\n obj.date_joined = obj.date_joined.strftime(\"%Y-%m-%d %H:%M\")\n writer.writerow(\n [getattr(obj, field) for field in user_model_fields] +\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -22,7 +22,7 @@ def read(*parts):\n 'django-cas-ng==3.5.8',\n 'django-el-pagination==3.1.0',\n 'django-extensions',\n- 'django-google-analytics-app==4.0.0',\n+ 'django-google-analytics-app==4.1.0',\n 'django-libsass',\n 'django-mptt==0.8.6',\n 'djangorestframework==3.4.0',\n@@ -38,6 +38,7 @@ def read(*parts):\n 'setuptools>=18.5',\n 'six>=1.9',\n 'ujson==1.35',\n+ 'unicodecsv==0.14.1',\n 'unicore.content',\n 'wagtail>=1.13,<1.14',\n 'wagtailmedia==0.1.3',\n", "test_patch": "diff --git a/molo/core/api/tests/utils.py b/molo/core/api/tests/utils.py\n--- a/molo/core/api/tests/utils.py\n+++ b/molo/core/api/tests/utils.py\n@@ -113,7 +113,7 @@ def mocked_fetch_and_create_image(url, image_title):\n )\n context = {\n \"file_url\": url,\n- \"foreign_title\": image_title.encode('utf-8'),\n+ \"foreign_title\": image_title,\n }\n return (image, context)\n \ndiff --git a/molo/profiles/tests/test_admin.py b/molo/profiles/tests/test_admin.py\n--- a/molo/profiles/tests/test_admin.py\n+++ b/molo/profiles/tests/test_admin.py\n@@ -119,7 +119,7 @@ def test_download_csv(self):\n '',\n ]\n self.assertTrue(isinstance(response, HttpResponse))\n- self.assertEquals(response.getvalue(), \"\\r\\n\".join(expected_csv))\n+ self.assertContains(response, \"\\r\\n\".join(expected_csv))\n self.assertEquals(\n response['Content-Type'],\n 'text/csv',\n@@ -138,9 +138,7 @@ def test_download_csv_with_an_alias_contains_ascii_code(self):\n response = download_as_csv(ProfileUserAdmin(UserProfile, self.site),\n None,\n User.objects.all())\n- actual_csv_alias = response.getvalue().split(\"\\r\\n\")[1].split(',')[6]\n- expected_csv_alias = 'The Alias \\xf0\\x9f\\x98\\x81'\n- self.assertEquals(actual_csv_alias, expected_csv_alias)\n+ self.assertContains(response, 'The Alias \ud83d\ude01')\n \n def test_download_csv_with_an_username_contains_ascii_code(self):\n self.user.username = '\uc0ac\uc774\ub124'\n@@ -149,10 +147,7 @@ def test_download_csv_with_an_username_contains_ascii_code(self):\n response = download_as_csv(ProfileUserAdmin(UserProfile, self.site),\n None,\n User.objects.all())\n- actual_csv = response.getvalue()\n- actual_csv_username = actual_csv.split(\"\\r\\n\")[1].split(',')[0]\n- expected_csv_username = '\\xec\\x82\\xac\\xec\\x9d\\xb4\\xeb\\x84\\xa4'\n- self.assertEquals(actual_csv_username, expected_csv_username)\n+ self.assertContains(response, '\uc0ac\uc774\ub124')\n \n \n class TestFrontendUsersAdminView(TestCase, MoloTestCaseMixin):\ndiff --git a/molo/profiles/tests/test_views.py b/molo/profiles/tests/test_views.py\n--- a/molo/profiles/tests/test_views.py\n+++ b/molo/profiles/tests/test_views.py\n@@ -1612,7 +1612,7 @@ def test_unidentified_user_gets_error(self):\n \"question_0\": \"20\",\n }\n )\n- self.failUnless(error_message in response.content)\n+ self.assertContains(response, error_message)\n \n def test_suspended_user_gets_error(self):\n error_message = \"The username and security question(s) combination \" \\\n@@ -1625,7 +1625,7 @@ def test_suspended_user_gets_error(self):\n \"question_0\": \"20\",\n }\n )\n- self.failUnless(error_message in response.content)\n+ self.assertContains(response, error_message)\n self.user.is_active = True\n self.user.save()\n \n@@ -1638,7 +1638,7 @@ def test_incorrect_security_answer_gets_error(self):\n \"question_0\": \"21\",\n }\n )\n- self.failUnless(error_message in response.content)\n+ self.assertContains(response, error_message)\n \n def test_too_many_retries_result_in_error(self):\n error_message = (\"Too many attempts\")\n@@ -1653,7 +1653,7 @@ def test_too_many_retries_result_in_error(self):\n \"question_0\": \"200\",\n }\n )\n- self.failUnless(error_message in response.content)\n+ self.assertContains(response, error_message)\n \n def test_correct_username_and_answer_results_in_redirect(self):\n response = self.client.post(\n@@ -1849,7 +1849,7 @@ def test_translated_question_appears_on_registration(self):\n # is asked\n self.client.get('/locale/en/')\n response = self.client.get(reverse(\"molo.profiles:forgot_password\"))\n- self.failIf(\"How old are you in french\" in response.content)\n+ self.assertNotContains(response, \"How old are you in french\")\n \n \n class ResetPasswordViewTest(TestCase, MoloTestCaseMixin):\n", "problem_statement": "", "hints_text": "", "created_at": "2018-01-12T14:00:55Z"}
|