Fix UnicodeDecodeError in Python 2 object macros

aichaos · Jul 8, 2016 · 1efde2d · 1efde2d
1 parent aba2721
commit 1efde2d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,6 @@ python:
   - "3.4"
   - "3.5"
   - "3.5-dev" # 3.5 development branch
-  - "nightly"
+  # - "nightly"
 install: "pip install -r requirements.txt"
 script: nosetests
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,9 @@
 Revision history for the Python package RiveScript.
 
+1.12.3  Jul 8 2016
+  - Fix the Python object macro handler to use `six.text_type` on the return
+    value, allowing Python 2 objects to return Unicode strings.
+
 1.12.2  May 31 2016
   - Fix a couple of bugs with `set_uservars()`.
 

diff --git a/python-rivescript.spec b/python-rivescript.spec
@@ -3,7 +3,7 @@
 %global desc A scripting language to make it easy to write responses for a chatterbot.
 
 Name:           python-%{srcname}
-Version:        1.12.2
+Version:        1.12.3
 Release:        1%{?dist}
 Summary:        %{sum}
 

diff --git a/rivescript/__init__.py b/rivescript/__init__.py
@@ -39,7 +39,7 @@
 __docformat__  = 'plaintext'
 
 __all__      = ['rivescript']
-__version__  = '1.12.2'
+__version__  = '1.12.3'
 
 from .rivescript import RiveScript, RiveScriptError, NoMatchError, NoReplyError,\
     ObjectError, DeepRecursionError, NoDefaultRandomTopicError, RepliesNotSortedError
diff --git a/rivescript/python.py b/rivescript/python.py
@@ -24,6 +24,7 @@
 
 # Python3 compat
 from __future__ import print_function, unicode_literals
+from six import text_type
 
 __docformat__ = 'plaintext'
 
@@ -98,7 +99,7 @@ def call(self, rs, name, user, fields):
                 reply = ''
         except Exception as e:
             raise PythonObjectError("Error executing Python object: " + str(e))
-        return str(reply)
+        return text_type(reply)
 
 
 class PythonObjectError(Exception):