From 0f42c7bdb7d0fba187a8997d0ee8a828d4c2c604 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 5 Sep 2019 08:55:50 -0400 Subject: [PATCH 1/3] Unicode raw strings don't exist in python 3. --- .../management/tests/test_populate_retirement_states.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py b/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py index 8cc8fd8202..33c2ce103e 100644 --- a/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py +++ b/openedx/core/djangoapps/user_api/management/tests/test_populate_retirement_states.py @@ -87,7 +87,7 @@ def test_out_of_order_start_state(settings): del settings.RETIREMENT_STATES[0] settings.RETIREMENT_STATES.insert(4, 'PENDING') - with pytest.raises(CommandError, match=ur'{} must be the first state'.format(START_STATE)): + with pytest.raises(CommandError, match=u'{} must be the first state'.format(START_STATE)): call_command('populate_retirement_states') From f068bab7ab4ae6a321a61ff37453ef7d9879a4f1 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 5 Sep 2019 10:12:32 -0400 Subject: [PATCH 2/3] Import EnvironmentVarGuard from the new location that's valid in 2.7 and 3.5 --- pavelib/paver_tests/test_paver_bok_choy_cmds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py index 69ad257eac..ed7b9db214 100644 --- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py +++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py @@ -6,7 +6,7 @@ from __future__ import absolute_import import os import unittest -from test.test_support import EnvironmentVarGuard +from test.support import EnvironmentVarGuard from pavelib.utils.test.suites import BokChoyTestSuite From 6c5780c8071d3b2620655ff083c1c7f80cab40fb Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 5 Sep 2019 12:41:22 -0400 Subject: [PATCH 3/3] The version of python2 we're running doesn't have the backported alias. --- pavelib/paver_tests/test_paver_bok_choy_cmds.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py index ed7b9db214..855f636e4d 100644 --- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py +++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py @@ -6,7 +6,12 @@ from __future__ import absolute_import import os import unittest -from test.support import EnvironmentVarGuard +import six + +if six.PY2: + from test.test_support import EnvironmentVarGuard +else: + from test.support import EnvironmentVarGuard # pylint: disable=import-error,no-name-in-module from pavelib.utils.test.suites import BokChoyTestSuite