Preventing unicode errors due to unicode->str coercion.

markfinger · markfinger · commit 2c35e21f1e8d · 2015-04-16T15:53:45.000+10:00
diff --git a/django_react/render.py b/django_react/render.py
@@ -3,6 +3,7 @@
 from django.contrib.staticfiles import finders
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.safestring import mark_safe
+from optional_django import six
 from .exceptions import ComponentSourceFileNotFound, ComponentWasNotBundled
 from .services import RenderService
 from .settings import WATCH_SOURCE
@@ -31,7 +32,10 @@ def __unicode__(self):
     def render_markup(self):
         markup = self.markup
         if self.bundle and not self.to_static_markup:
-            markup = '<span id="{id}">{markup}</span>'.format(
+            template = '<span id="{id}">{markup}</span>'
+            if six.PY2:
+                template = unicode(template)
+            markup = template.format(
                 id=self.get_container_id(),
                 markup=markup,
             )
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 django
 django-node==4.0.0
-django-webpack==3.0.1
+django-webpack==3.0.1
+optional-django==0.1.0
