From 6dc8e40a232e91b1e315325492e4df1cb40e3063 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 10 Sep 2019 00:42:47 -0500 Subject: [PATCH 1/3] Fix CSV import error message --- tests/test_grades/test_csv.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_grades/test_csv.py b/tests/test_grades/test_csv.py index 9fceb06c..2cc6337a 100644 --- a/tests/test_grades/test_csv.py +++ b/tests/test_grades/test_csv.py @@ -413,8 +413,7 @@ class ImportGradesTest(GradesTestMixin, TestCase): def test_import_file_error(self): expected_file_error_msg = ( - "Error: line contains NULL byte. Are you sure the file is a " - "CSV file other than a Microsoft Excel file?") + "Error: line contains NUL") with open( os.path.join(CSV_PATH, 'test_import_excel_failed.xlsx'), -- GitLab From e2809bc04e3d612854a28b40b5704e6e598f4ad7 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 10 Sep 2019 18:51:21 -0500 Subject: [PATCH 2/3] Fix pypi badge in README --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 9a264a0d..2a6b7da7 100644 --- a/README.rst +++ b/README.rst @@ -15,9 +15,9 @@ Relate is an Environment for Learning And TEaching .. image:: https://ci.appveyor.com/api/projects/status/d5bigdw90bxnfdgy?svg=true :alt: Appveyor CI Status :target: https://ci.appveyor.com/project/inducer/relate -.. image:: https://badge.fury.io/py/relate.png +.. image:: https://badge.fury.io/py/relate-courseware.png :alt: Python Package Index Release Page - :target: https://pypi.org/project/relate/ + :target: https://pypi.org/project/relate-courseware/ +----------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+ | .. image:: https://raw.githubusercontent.com/inducer/relate/master/doc/images/screenshot.png | .. image:: https://raw.githubusercontent.com/inducer/relate/master/doc/images/screenshot-2.png | -- GitLab From b9149a9331d05fed665e80bff0cf82f1eefcb98a Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 10 Sep 2019 00:39:52 -0500 Subject: [PATCH 3/3] Fix error message typo --- accounts/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/models.py b/accounts/models.py index 92a6e259..678398c9 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -180,7 +180,7 @@ class User(AbstractBaseUser, PermissionsMixin): # Intentionally don't fallback if it failed -- let user see the exception. result = mask_method(self) if not result: - raise RuntimeError("get_masked_profile should not None.") + raise RuntimeError("get_masked_profile should not return None.") else: result = str(result).strip() if not result: -- GitLab