Merge pull request #41 from aichaos/bug/40-unicode

Fix a regression supporting Unicode in Python 2
aichaos · Aug 9, 2016 · 33e5a72 · 33e5a72
2 parents 6b5392d + 3eba80c
commit 33e5a72
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1 deletion.
diff --git a/rivescript/brain.py b/rivescript/brain.py
@@ -5,6 +5,7 @@
 #
 # https://www.rivescript.com/
 
+from __future__ import unicode_literals
 from .regexp import RE
 from .exceptions import (
     RiveScriptError, RepliesNotSortedError, NoDefaultRandomTopicError,

diff --git a/rivescript/interactive.py b/rivescript/interactive.py
@@ -11,7 +11,7 @@
 import json
 import re
 from six.moves import input
-from six import text_type
+from six import text_type, PY2
 
 from rivescript import RiveScript
 
@@ -245,6 +245,9 @@ def interactive_mode():
 
     while True:
         msg = input("You> ")
+        if PY2:
+            # For Python 2 only: cast the message to Unicode.
+            msg = msg.decode("utf-8")
 
         # Commands
         if msg == '/help':

diff --git a/rivescript/parser.py b/rivescript/parser.py
@@ -5,6 +5,7 @@
 #
 # https://www.rivescript.com/
 
+from __future__ import unicode_literals
 from .regexp import RE
 
 import re

diff --git a/rivescript/sorting.py b/rivescript/sorting.py
@@ -5,6 +5,7 @@
 #
 # https://www.rivescript.com/
 
+from __future__ import unicode_literals
 from .regexp import RE
 from . import utils
 import re

diff --git a/rivescript/utils.py b/rivescript/utils.py
@@ -5,6 +5,7 @@
 #
 # https://www.rivescript.com/
 
+from __future__ import unicode_literals
 from .regexp import RE
 import re
 import string

diff --git a/tests/test_unicode.py b/tests/test_unicode.py
@@ -20,6 +20,12 @@ def test_unicode(self):
             + ブラッキー
             - エーフィ
 
+            + my favorite game is *
+            - <set game=<formal>>When did you first start playing <get game>?
+
+            + what is my favorite game
+            - Wasn't it <get game>?
+
             // Make sure %Previous continues working in UTF-8 mode.
             + knock knock
             - Who's there?
@@ -51,6 +57,8 @@ def test_unicode(self):
 
         self.reply("äh", "What's the matter?")
         self.reply("ブラッキー", "エーフィ")
+        self.reply("My favorite game is Pokémon", "When did you first start playing Pokémon?")
+        self.reply("What is my favorite game?", "Wasn't it Pokémon?")
         self.reply("knock knock", "Who's there?")
         self.reply("Orange", "Orange who?")
         self.reply("banana", "Haha! Banana!")