Python 2/3 unicode compatibility fix

FujiMakoto · FujiMakoto · commit 57fc33b85203 · 2015-05-01T05:52:28.000-04:00
diff --git a/rivescript/rivescript.py b/rivescript/rivescript.py
@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 from __future__ import unicode_literals
+from six import text_type
 import sys
 import os
 import re
@@ -207,7 +208,7 @@ def stream(self, code):
         `code` can either be a string containing RiveScript code or an array
         of lines of RiveScript code."""
         self._say("Streaming code.")
-        if type(code) in [str, unicode]:
+        if type(code) in [str, text_type]:
             code = code.split("\n")
         self._parse("stream()", code)
 
@@ -838,7 +839,7 @@ def write(self, fh, deparsed=None):
             for var in sorted(deparsed["begin"][kind].keys()):
                 # Array types need to be separated by either spaces or pipes.
                 data = deparsed["begin"][kind][var]
-                if type(data) not in [str, unicode]:
+                if type(data) not in [str, text_type]:
                     needs_pipes = False
                     for test in data:
                         if " " in test:
@@ -2108,15 +2109,15 @@ def _process_tags(self, user, msg, reply, st=[], bst=[], depth=0):
                 if "=" in data:
                     # Setting a bot/env variable.
                     parts = data.split("=")
-                    self._say("Set " + tag + " variable " + unicode(parts[0]) + "=" + unicode(parts[1]))
+                    self._say("Set " + tag + " variable " + text_type(parts[0]) + "=" + text_type(parts[1]))
                     target[parts[0]] = parts[1]
                 else:
                     # Getting a bot/env variable.
                     insert = target.get(data, "undefined")
             elif tag == "set":
                 # <set> user vars.
                 parts = data.split("=")
-                self._say("Set uservar " + unicode(parts[0]) + "=" + unicode(parts[1]))
+                self._say("Set uservar " + text_type(parts[0]) + "=" + text_type(parts[1]))
                 self._users[user][parts[0]] = parts[1]
             elif tag in ["add", "sub", "mult", "div"]:
                 # Math operator tags.
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
         'Intended Audience :: Developers',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
     ],
-    install_requires = [ 'setuptools' ],
+    install_requires = [ 'setuptools', 'six' ],
 )
 
 # vim:expandtab

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`'Intended Audience :: Developers',`
`23`	`23`	`'Topic :: Scientific/Engineering :: Artificial Intelligence',`
`24`	`24`	`],`
`25`		`- install_requires = [ 'setuptools' ],`
	`25`	`+ install_requires = [ 'setuptools', 'six' ],`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`# vim:expandtab`