python 3 fixes
python 3 fixes python 3 fixes python 3 fixes minor changes
This commit is contained in:
@@ -9,9 +9,10 @@ from unittest import skip
|
||||
|
||||
import mock
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils import six, translation
|
||||
from django.utils import translation
|
||||
from django.utils.translation import get_language
|
||||
|
||||
from openedx.core.lib.edx_six import get_gettext
|
||||
from contentstore.tests.utils import AjaxEnabledTestClient
|
||||
from contentstore.views.preview import _preview_module_system
|
||||
from xmodule.modulestore.django import ModuleI18nService
|
||||
@@ -94,21 +95,19 @@ class TestModuleI18nService(ModuleStoreTestCase):
|
||||
|
||||
def __init__(self, module):
|
||||
self.module = module
|
||||
gettext_variant = 'ugettext' if six.PY2 else 'gettext'
|
||||
self.old_ugettext = getattr(module, gettext_variant)
|
||||
self.old_ugettext = get_gettext(module)
|
||||
|
||||
def __enter__(self):
|
||||
def new_ugettext(*args, **kwargs):
|
||||
""" custom function """
|
||||
output = self.old_ugettext(*args, **kwargs)
|
||||
return "XYZ " + output
|
||||
|
||||
gettext_variant = 'ugettext' if six.PY2 else 'gettext'
|
||||
setattr(self.module, gettext_variant, new_ugettext)
|
||||
self.module.ugettext = new_ugettext
|
||||
self.module.gettext = new_ugettext
|
||||
|
||||
def __exit__(self, _type, _value, _traceback):
|
||||
gettext_variant = 'ugettext' if six.PY2 else 'gettext'
|
||||
setattr(self.module, gettext_variant, self.old_ugettext)
|
||||
self.module.ugettext = self.old_ugettext
|
||||
self.module.gettext = self.old_ugettext
|
||||
|
||||
i18n_service = self.get_module_i18n_service(self.descriptor)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user