From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 13 Feb 2014 00:38:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'hg/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fdev;p=django-postman.git

Merge remote-tracking branch 'hg/master'

Conflicts:
	postman/tests.py
---

116cc75edabdfe83dd1df54f0d90e29687e7206b
diff --cc postman/models.py
index 59be98f,a819f71..8bf0339
--- a/postman/models.py
+++ b/postman/models.py
@@@ -72,16 -74,15 +74,16 @@@ def get_user_representation(user)
          if callable(attr):
              attr = attr()
          if attr:
-             return unicode(attr)
+             return force_text(attr)
      elif callable(show_user_as):
          try:
-             return unicode(show_user_as(user))
+             return force_text(show_user_as(user))
          except:
              pass
-     return unicode(user)  # default value, or in case of empty attribute or exception
+     return force_text(user)  # default value, or in case of empty attribute or exception
  
 -
 +# import logging
 +# logging.getLogger('django.db.backends').setLevel(logging.DEBUG)
  class MessageManager(models.Manager):
      """The manager for Message."""