Make sure the output from the view server is in utf-8 (issue 81).

djc · djc · commit fb0bb99599cd · 2009-12-14T13:07:21.000+01:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,4 +1,4 @@
-Version 0.7
+Version 0.7.0
 http://couchdb-python.googlecode.com/hg/?r=default
 (???, from branches/0.7.x)
 
@@ -17,6 +17,7 @@ http://couchdb-python.googlecode.com/hg/?r=default
  * `schema.ListField` objects now have correct behavior for slicing operations
    and the `pop()` method (issue 92).
  * Added a `revisions()` method to the Database class (issue 99).
+ * Make sure we always return UTF-8 from the view server (issue 81).
 
 
 Version 0.6
diff --git a/couchdb/tests/view.py b/couchdb/tests/view.py
@@ -36,6 +36,15 @@ def test_map_doc(self):
                          'true\n'
                          '[[[null, {"foo": "bar"}]]]\n')
 
+    def test_i18n(self):
+        input = StringIO('["add_fun", "def fun(doc): yield doc[\\"test\\"], doc"]\n'
+                         '["map_doc", {"test": "b\xc3\xa5r"}]\n')
+        output = StringIO()
+        view.run(input=input, output=output)
+        self.assertEqual(output.getvalue(),
+                         'true\n'
+                         '[[["b\xc3\xa5r", {"test": "b\xc3\xa5r"}]]]\n')
+
     def test_map_doc_with_logging(self):
         fun = 'def fun(doc): log(\'running\'); yield None, doc'
         input = StringIO('["add_fun", "%s"]\n'
diff --git a/couchdb/view.py b/couchdb/view.py
@@ -32,12 +32,18 @@ def run(input=sys.stdin, output=sys.stdout):
     """
     functions = []
 
+    def _writejson(obj):
+        obj = json.encode(obj)
+        if isinstance(obj, unicode):
+            obj = obj.encode('utf-8')
+        output.write(obj)
+        output.write('\n')
+        output.flush()
+
     def _log(message):
         if not isinstance(message, basestring):
             message = json.encode(message)
-        output.write(json.encode({'log': message}))
-        output.write('\n')
-        output.flush()
+        _writejson({'log': message})
 
     def reset(config=None):
         del functions[:]
@@ -135,9 +141,7 @@ def rereduce(*cmd):
             else:
                 retval = handlers[cmd[0]](*cmd[1:])
                 log.debug('Returning  %r', retval)
-                output.write(json.encode(retval))
-                output.write('\n')
-                output.flush()
+                _writejson(retval)
     except KeyboardInterrupt:
         return 0
     except Exception, e:
