More tests for escape.

.travis.yml

@@ -5,6 +5,7 @@ python:
     - "3.2"
     - "3.3"
     - "3.4"
+    - "pypy"
 
 install:
     - pip install -r cyclone/tests/test_requirements.txt

cyclone/tests/test_utils.py

@@ -18,8 +18,8 @@
 from cyclone.escape import xhtml_escape, xhtml_unescape
 from cyclone.escape import json_encode, json_decode
 from cyclone.escape import squeeze, url_escape, url_unescape
-from cyclone.escape import utf8, to_unicode
-
+from cyclone.escape import utf8, to_unicode, to_basestring
+from cyclone.escape import recursive_unicode
 
 class EscapeTest(unittest.TestCase):
     def test_xhtml_escape(self):
@@ -57,5 +57,19 @@ def test_utf8(self):
         self.assertEqual(utf8(u"rawr"), "rawr")
 
     def test_to_unicode(self):
-        self.assertEqual(to_unicode("rawr"), "rawr")
-        self.assertEqual(to_unicode(u"rawr"), "rawr")
+        self.assertEqual(to_unicode("rawr"), u"rawr")
+        self.assertEqual(to_unicode(u"rawr"), u"rawr")
+
+    def test_to_basestring(self):
+        """
+        Not sure this is 100% testable in python 2.
+        """
+        self.assertEqual(to_basestring("rawr"), "rawr")
+        self.assertEqual(to_basestring(u"rawr"), "rawr")
+
+    def test_recursive_unicode(self):
+        self.assertEqual(recursive_unicode("rawr"), u"rawr")
+        self.assertEqual(
+            recursive_unicode({"rawr": "rawr"}), {"rawr": u"rawr"})
+        self.assertEqual(
+            recursive_unicode(["rawr", "rawr"]), [u"rawr", u"rawr"])