mirror of
https://github.com/ansible/awx.git
synced 2026-07-05 21:38:03 -02:30
Fix up new Django 3.0 deprecations
Mostly text based: force/smart_text, ugettext_*
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.encoding import smart_text
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.utils.encoding import smart_str
|
||||
|
||||
# Python
|
||||
from awx.main.models import (
|
||||
@@ -171,7 +171,7 @@ class WorkflowDAG(SimpleDAG):
|
||||
parms['node_status'] = ",".join(["({},{})".format(id, status) for id, status in failed_path_nodes_id_status])
|
||||
if len(failed_unified_job_template_node_ids) > 0:
|
||||
parms['no_ufjt'] = ",".join(failed_unified_job_template_node_ids)
|
||||
return True, smart_text(s.format(**parms))
|
||||
return True, smart_str(s.format(**parms))
|
||||
return False, None
|
||||
|
||||
r'''
|
||||
|
||||
@@ -7,7 +7,7 @@ from urllib import parse as urlparse
|
||||
from django.conf import settings
|
||||
from kubernetes import client, config
|
||||
from django.utils.functional import cached_property
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from awx.main.utils.common import parse_yaml_or_json, deepmerge
|
||||
from awx.main.utils.execution_environments import get_default_pod_spec
|
||||
|
||||
@@ -10,7 +10,7 @@ from types import SimpleNamespace
|
||||
|
||||
# Django
|
||||
from django.db import transaction, connection
|
||||
from django.utils.translation import ugettext_lazy as _, gettext_noop
|
||||
from django.utils.translation import gettext_lazy as _, gettext_noop
|
||||
from django.utils.timezone import now as tz_now
|
||||
from django.conf import settings
|
||||
|
||||
|
||||
Reference in New Issue
Block a user