Merge remote-tracking branch 'origin/master' into development

mayan/apps/rest_api/classes.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 from django.conf.urls import include, url
 from django.conf import settings
+from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.module_loading import import_string
 
 from .exceptions import APIResourcePatternError
@@ -28,6 +29,7 @@ class APIResource(object):
         self.__class__._registry[self.name] = self
 
 
+@python_2_unicode_compatible
 class APIEndPoint(object):
     _registry = {}
     _patterns = []
@@ -40,8 +42,8 @@ class APIEndPoint(object):
     def get(cls, name):
         return cls._registry[name]
 
-    def __unicode__(self):
-        return unicode(self.app.name)
+    def __str__(self):
+        return force_text(self.app.name)
 
     def __init__(self, app, version_string, name=None):
         self.app = app