Skip to content

Commit

Permalink
restore compatability for django 1.11, on py2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
graingert committed Oct 1, 2020
1 parent 3b240cd commit 1b94c30
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions django_js_reverse/core.py
Expand Up @@ -10,7 +10,11 @@
from django.core.exceptions import ImproperlyConfigured
from django.template import loader
from django.utils.safestring import mark_safe
from django.utils.encoding import force_str

if sys.version_info <= (2, 7):
from django.utils.encoding import force_text
else:
from django.utils.encoding import force_str as force_text

from . import rjsmin
from .js_reverse_settings import (JS_EXCLUDE_NAMESPACES, JS_GLOBAL_OBJECT_NAME,
Expand Down Expand Up @@ -112,9 +116,9 @@ def generate_json(default_urlresolver, script_prefix=None):
return collections.OrderedDict([
('urls', [
[
force_str(name),
force_text(name),
[
[force_str(path), [force_str(arg) for arg in args]]
[force_text(path), [force_text(arg) for arg in args]]
for path, args in patterns
],
] for name, patterns in urls
Expand Down

0 comments on commit 1b94c30

Please sign in to comment.