From 5c543ac364fe6041a4c6ee6a5632fc180ced819f Mon Sep 17 00:00:00 2001
From: Jean-Louis Fuchs <ganwell@fangorn.ch>
Date: Sat, 7 Dec 2013 22:50:20 +0100
Subject: [PATCH] * unicode compatibility

---
 jedi/parser/token.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jedi/parser/token.py b/jedi/parser/token.py
index 4d83930a..6c025a80 100644
--- a/jedi/parser/token.py
+++ b/jedi/parser/token.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """ Efficient representation of tokens
 
 We want to have a token_list and start_position for everything the
@@ -5,6 +6,8 @@ tokenizer returns. Therefore we need a memory efficient class. We
 found that a flat object with slots is the best.
 """
 
+from jedi._compatibility import unicode
+
 
 class Token(object):
     """The token object is an efficient representation of the structure
@@ -14,8 +17,8 @@ class Token(object):
 
     >>> tuple(Token(1,2,3,4))
     (1, 2, (3, 4))
-    >>> str(Token(1, "test", 1, 1))
-    'test'
+    >>> unicode(Token(1, "test", 1, 1)) == "test"
+    True
     >>> repr(Token(1, "test", 1, 1))
     "<Token: (1, 'test', (1, 1))>"
     >>> Token(1, 2, 3, 4).__getstate__()
@@ -40,6 +43,8 @@ class Token(object):
     4
     >>> Token.from_tuple((6, 5, (4, 3)))
     <Token: (6, 5, (4, 3))>
+    >>> unicode(Token(1, u"😷", 1 ,1)) + "p" == u"😷p"
+    True
     """
     __slots__ = [
         "token_type", "token", "start_pos_line", "start_pos_col"
@@ -60,9 +65,13 @@ class Token(object):
     def __repr__(self):
         return "<%s: %s>" % (type(self).__name__, tuple(self))
 
-    # Backward compatibility
+    # Backward compatibility py2
+    def __unicode__(self):
+        return unicode(self.token)
+
+    # Backward compatibility py3
     def __str__(self):
-        return str(self.token)
+        return unicode(self.token)
 
     # Backward compatibility
     def __getitem__(self, key):