Merge b2a2456 into e32a762

kobo/django/auth/models.py

@@ -1,11 +1,13 @@
 import re
 from django.db import models
 from django.core import validators
-from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, UserManager
 from django.core.mail import send_mail
 from django.utils import timezone
 
+from kobo.django.compat import gettext_lazy as _
+
+
 MAX_LENGTH = 255
 
 class User(AbstractBaseUser, PermissionsMixin):

kobo/django/compat.py

@@ -0,0 +1,17 @@
+try:
+    # Ancient case: ugettext is the unicode-aware variant
+    from django.utils.translation import ugettext_lazy as gettext_lazy
+except ImportError:
+    # Modern (py3-only) case
+    from django.utils.translation import gettext_lazy
+
+
+try:
+    # Ancient case: force_text is the unicode-aware variant
+    from django.utils.encoding import force_text as force_str
+except:
+    # Modern (py3-only) case
+    from django.utils.encoding import force_str
+
+
+__all__ = ["gettext_lazy", "force_str"]

kobo/django/fields.py

@@ -3,14 +3,15 @@
 import json
 import six
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
 from django.core import exceptions
 from django.utils.text import capfirst
 from django.forms.widgets import Select
 from django.forms.fields import CallableChoiceIterator
 
 import kobo.django.forms
 from kobo.types import StateEnum
+from kobo.django.compat import gettext_lazy as _
+
 
 '''
 StateEnumField

kobo/django/forms.py

@@ -8,15 +8,15 @@
 
 import django.forms.fields
 from django.core.exceptions import ValidationError
-from django.utils.encoding import force_text
 from django.utils.safestring import mark_safe
 from django.utils.html import conditional_escape
-from django.utils.translation import ugettext_lazy as _
 try:
     from django.forms.utils import flatatt
 except ImportError:
     from django.forms.util import flatatt
 
+from kobo.django.compat import gettext_lazy as _, force_str
+
 
 class StateChoiceFormField(django.forms.fields.TypedChoiceField):
     '''
@@ -52,7 +52,7 @@ def render(self, name, value, attrs=None, renderer=None):
             value = json.dumps(value)
 
         return mark_safe(u'<textarea%s>%s</textarea>' % (flatatt(final_attrs),
-                conditional_escape(force_text(value))))
+                conditional_escape(force_str(value))))
 
 
 class JSONFormField(django.forms.fields.CharField):

kobo/hub/models.py

@@ -23,13 +23,14 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.db import models, connection, transaction
-from django.utils.translation import ugettext_lazy as _
 from django.db.models.signals import post_delete
 import six
 
 import kobo.django.fields
 from kobo.client.constants import TASK_STATES, FINISHED_STATES, FAILED_STATES
 from kobo.shortcuts import random_string, read_from_file, save_to_file, run
+from kobo.django.compat import gettext_lazy as _
+
 
 LOG_BUFFER_SIZE = 2**20
 

kobo/hub/urls/arch.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
 
-from django.utils.translation import ugettext_lazy as _
 from django.conf.urls import url
 from kobo.django.views.generic import ExtraListView
 from kobo.hub.views import ArchDetailView
 from kobo.hub.models import Arch
+from kobo.django.compat import gettext_lazy as _
+
 
 urlpatterns = [
     url(r"^$", ExtraListView.as_view(

kobo/hub/urls/task.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 
-from django.utils.translation import ugettext_lazy as _
 from django.conf.urls import url
 from kobo.hub.models import TASK_STATES
 from kobo.hub.views import TaskListView, TaskDetail
 import kobo.hub.views
+from kobo.django.compat import gettext_lazy as _
 
 
 urlpatterns = [

kobo/hub/urls/user.py

@@ -3,9 +3,9 @@
 
 from django.contrib.auth import get_user_model
 from django.conf.urls import url
-from django.utils.translation import ugettext_lazy as _
 from kobo.django.views.generic import ExtraListView
 from kobo.hub.views import UserDetailView
+from kobo.django.compat import gettext_lazy as _
 
 
 urlpatterns = [

kobo/hub/urls/worker.py

@@ -2,9 +2,9 @@
 
 
 from django.conf.urls import url
-from django.utils.translation import ugettext_lazy as _
 from kobo.django.views.generic import ExtraListView, ExtraDetailView
 from kobo.hub.models import Worker
+from kobo.django.compat import gettext_lazy as _
 
 
 urlpatterns = [

kobo/hub/views.py

@@ -23,12 +23,13 @@
 from django.http import HttpResponse, StreamingHttpResponse, HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404
 from django.template import RequestContext
-from django.utils.translation import ugettext_lazy as _
 from django.views.generic import RedirectView
 
 from kobo.hub.models import Arch, Channel, Task
 from kobo.hub.forms import TaskSearchForm
 from kobo.django.views.generic import ExtraDetailView, SearchView
+from kobo.django.compat import gettext_lazy as _
+
 
 # max log size returned in HTML-embedded view
 HTML_LOG_MAX_SIZE = getattr(settings, "HTML_LOG_MAX_SIZE", (1024 ** 2) * 2)