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

kirsle · web-flow · commit 33e5a7237327 · 2016-08-09T11:12:47.000-07:00
Fix a regression supporting Unicode in Python 2
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):
             + &#12502;&#12521;&#12483;&#12461;&#12540;
             - &#12456;&#12540;&#12501;&#12451;
 
+            + 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("&auml;h", "What's the matter?")
         self.reply("&#12502;&#12521;&#12483;&#12461;&#12540;", "&#12456;&#12540;&#12501;&#12451;")
+        self.reply("My favorite game is Pok&eacute;mon", "When did you first start playing Pok&eacute;mon?")
+        self.reply("What is my favorite game?", "Wasn't it Pok&eacute;mon?")
         self.reply("knock knock", "Who's there?")
         self.reply("Orange", "Orange who?")
         self.reply("banana", "Haha! Banana!")

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`# https://www.rivescript.com/`
`7`	`7`
	`8`	`+from __future__ import unicode_literals`
`8`	`9`	`from .regexp import RE`
`9`	`10`	`from .exceptions import (`
`10`	`11`	`RiveScriptError, RepliesNotSortedError, NoDefaultRandomTopicError,`