Fix some bugs in set_uservars for 1.12.2

kirsle · kirsle · commit aba2721a9f14 · 2016-05-31T13:51:21.000-07:00
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,8 @@
 Revision history for the Python package RiveScript.
 
+1.12.2  May 31 2016
+  - Fix a couple of bugs with `set_uservars()`.
+
 1.12.1  May 31 2016
   - Added API functions: `get_global(name)`, `get_variable(name)`, and
     `set_uservars(user || dict[, dict])` -- the latter is for setting many
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.1
+Version:        1.12.2
 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.1'
+__version__  = '1.12.2'
 
 from .rivescript import RiveScript, RiveScriptError, NoMatchError, NoReplyError,\
     ObjectError, DeepRecursionError, NoDefaultRandomTopicError, RepliesNotSortedError
diff --git a/rivescript/rivescript.py b/rivescript/rivescript.py
@@ -1549,16 +1549,22 @@ def set_uservars(self, user, data=None):
                 for key, value in uservars.items():
                     self._users[uid][key] = value
 
-        elif type(user) in [text_type] and type(data) is dict:
+        elif type(user) in [text_type, str] and type(data) is dict:
             # Setting variables for a single user.
+            if not user in self._users:
+                self._users[user] = dict(topic="random")
+
             for key, value in data.items():
                 self._users[user][key] = value
 
         else:
             raise TypeError(
-                "set_uservars() may only be called with types (str, dict) or "
-                "(dict<str, dict>) but you called it with types ({}, {})".format(
-                    type(user), type(data),
+                "set_uservars() may only be called with types ({str}, dict) or "
+                "(dict<{str}, dict>) but you called it with types ({a}, {b})"
+                .format(
+                    str="unicode" if sys.version_info[0] < 3 else "str",
+                    a=type(user),
+                    b=type(data),
                 ),
             )
 
@@ -1831,7 +1837,7 @@ def _format_message(self, msg, botreply=False):
 
         # Make sure the string is Unicode for Python 2.
         if sys.version_info[0] < 3 and isinstance(msg, str):
-            msg = msg.decode('utf8')
+            msg = msg.decode()
 
         # Lowercase it.
         msg = msg.lower()
diff --git a/tests/test_rivescript.py b/tests/test_rivescript.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals, absolute_import
 
+import json
 import re
 import unittest
 from collections import OrderedDict
@@ -753,6 +754,17 @@ def test_set_uservars(self):
         # Non-existing users return None, not "undefined"
         self.assertEqual(self.rs.get_uservar("fake", "name"), None)
 
+        # Test setting vars from exported vars.
+        exported = self.rs.get_uservars("localuser")
+        self.assertEqual(self.rs.set_uservars("localuser", exported), None)
+
+        # Test setting vars from JSON.
+        self.assertEqual(self.rs.set_uservars("localuser",
+            json.loads('{"gender": "ambiguous"}')), None)
+
+        # Test setting user variables for users that don't exist yet.
+        self.assertEqual(self.rs.set_uservars("newbie", {"name": "Newbie"}), None)
+
         # Test calling with (str, None)
         with self.assertRaises(TypeError):
             self.rs.set_uservars("alice")
