Fix handling of unicode strings in the multipart writer.

cmlenz · cmlenz · commit dc36f703f532 · 2009-07-01T15:44:28.000Z
--HG--
extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%40174
diff --git a/couchdb/multipart.py b/couchdb/multipart.py
@@ -134,6 +134,13 @@ def add(self, mimetype, content, headers=None):
         self.fileobj.write(CRLF)
         if headers is None:
             headers = {}
+        if isinstance(content, unicode):
+            ctype, params = parse_header(mimetype)
+            if 'charset' in params:
+                content = content.encode(params['charset'])
+            else:
+                content = content.encode('utf-8')
+                mimetype = mimetype + ';charset=utf-8'
         headers['Content-Type'] = mimetype
         if content:
             headers['Content-Length'] = str(len(content))
diff --git a/couchdb/tests/multipart.py b/couchdb/tests/multipart.py
@@ -13,7 +13,7 @@
 from couchdb import multipart
 
 
-class ReadMultiPartTestCase(unittest.TestCase):
+class ReadMultipartTestCase(unittest.TestCase):
 
     def test_flat(self):
         text = '''\
@@ -149,10 +149,36 @@ def test_nested(self):
         self.assertEqual(num, 3)
 
 
+class WriteMultipartTestCase(unittest.TestCase):
+
+    def test_unicode_content(self):
+        buf = StringIO()
+        envelope = multipart.write_multipart(buf, boundary='==123456789==')
+        envelope.add('text/plain', u'Iñtërnâtiônàlizætiøn')
+        envelope.close()
+        self.assertEqual('''Content-Type: multipart/mixed; boundary="==123456789=="
+
+--==123456789==
+Content-Length: 27
+Content-MD5: 5eYoIG5zsa5ps3/Gl2Kh4Q==
+Content-Type: text/plain;charset=utf-8
+
+Iñtërnâtiônàlizætiøn
+--==123456789==--
+''', buf.getvalue().replace('\r\n', '\n'))
+
+    def test_unicode_content_ascii(self):
+        buf = StringIO()
+        envelope = multipart.write_multipart(buf, boundary='==123456789==')
+        self.assertRaises(UnicodeEncodeError, envelope.add,
+                          'text/plain;charset=ascii', u'Iñtërnâtiônàlizætiøn')
+
+
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(doctest.DocTestSuite(multipart))
-    suite.addTest(unittest.makeSuite(ReadMultiPartTestCase, 'test'))
+    suite.addTest(unittest.makeSuite(ReadMultipartTestCase, 'test'))
+    suite.addTest(unittest.makeSuite(WriteMultipartTestCase, 'test'))
     return suite
 
 
