Added test for T used in HTML tags, fix language encode(), close #1856

2018-02-12 21:13:19 +01:00
parent 44e27bf65f
commit fa31a6b61b
2 changed files with 27 additions and 2 deletions
@@ -431,7 +431,10 @@ class lazyT(object):
        return str(self) if self.M else local_html_escape(str(self), quote=False)

    def encode(self, *a, **b):
-        return str(self).encode(*a, **b)
+        if PY2 and a[0] != 'utf8':
+            return to_unicode(str(self)).encode(*a, **b)
+        else:
+            return str(self)

    def decode(self, *a, **b):
        if PY2: